[src/trunk]: src Try to pick up the right location for BEAGLEBONE and BEAGLEB...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0c9ada19447e
branches:  trunk
changeset: 789379:0c9ada19447e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Aug 17 13:08:16 2013 +0000

description:
Try to pick up the right location for BEAGLEBONE and BEAGLEBOARD kernels.

diffstat:

 distrib/utils/embedded/conf/beagleboard.conf |  9 ++++++---
 etc/etc.evbarm/Makefile.inc                  |  8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r 505fddbefae6 -r 0c9ada19447e distrib/utils/embedded/conf/beagleboard.conf
--- a/distrib/utils/embedded/conf/beagleboard.conf      Sat Aug 17 05:43:02 2013 +0000
+++ b/distrib/utils/embedded/conf/beagleboard.conf      Sat Aug 17 13:08:16 2013 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: beagleboard.conf,v 1.12 2013/08/16 00:03:01 jmcneill Exp $
+# $NetBSD: beagleboard.conf,v 1.13 2013/08/17 13:08:16 jmcneill Exp $
 # BeagleBoard customization script used by mkimage
 #
 board=beagleboard
 
-bboard_kernel="$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub"
-bbone_kernel="$src/sys/arch/evbarm/compile/obj/BEAGLEBONE/netbsd.ub"
+kernel="$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub $src/sys/arch/evbarm/compile/obj/BEAGLEBONE/netbsd.ub"
+
+set -- $kernel
+bboard_kernel=$1
+bbone_kernel=$2
 
 . ${DIR}/conf/evbarm.conf
 
diff -r 505fddbefae6 -r 0c9ada19447e etc/etc.evbarm/Makefile.inc
--- a/etc/etc.evbarm/Makefile.inc       Sat Aug 17 05:43:02 2013 +0000
+++ b/etc/etc.evbarm/Makefile.inc       Sat Aug 17 13:08:16 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.56 2013/08/07 20:57:22 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.57 2013/08/17 13:08:16 jmcneill Exp $
 #
 #      etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -93,7 +93,7 @@
        TOOL_MTREE=${TOOL_MTREE} \
        HOST_SH=${HOST_SH} \
        ${HOST_SH} ${MKIMAGE} -x -h ${.TARGET:S/smp_//} -D ${DESTDIR} \
-           -K ${.ALLSRC} -S ${NETBSDSRCDIR} ${MKI_OPTS.${.TARGET}} \
+           -K "${.ALLSRC}" -S ${NETBSDSRCDIR} ${MKI_OPTS.${.TARGET}} \
            ${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz
 
 ARCHES.arm=            armv4 xscale armv5t armv6 armv7
@@ -123,8 +123,8 @@
 .endfor
 
 .if !empty(KERNEL_SETS:MBEAGLEBOARD)
-smp_beagleboard: ${IMAGE.kern}/netbsd-BEAGLEBOARD.ub.gz __mkimage
-.if empty(ALL_KERNELS) || !empty(ALL_KERNELS:MBEAGLEBOARD)
+smp_beagleboard: ${IMAGE.kern}/netbsd-BEAGLEBOARD.ub.gz ${IMAGE.kern}/netbsd-BEAGLEBONE.ub.gz __mkimage
+.if empty(ALL_KERNELS) || (!empty(ALL_KERNELS:MBEAGLEBOARD) && !empty(ALL_KERNELS:MBEAGLEBONE))
 SNAP_MD_POST_DEPS+=    smp_beagleboard
 .endif
 .endif