[src/trunk]: src Instead of trying to pass two kernels to beagleboard.conf, p...

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

details:   https://anonhg.NetBSD.org/src/rev/8392ab35b0a4
branches:  trunk
changeset: 789450:8392ab35b0a4
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Aug 19 04:27:22 2013 +0000

description:
Instead of trying to pass two kernels to beagleboard.conf, pass one and
derive the path to the second from the first.

diffstat:

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

diffs (51 lines):

diff -r 547c8499b4e3 -r 8392ab35b0a4 distrib/utils/embedded/conf/beagleboard.conf
--- a/distrib/utils/embedded/conf/beagleboard.conf      Mon Aug 19 03:55:12 2013 +0000
+++ b/distrib/utils/embedded/conf/beagleboard.conf      Mon Aug 19 04:27:22 2013 +0000
@@ -1,13 +1,12 @@
-# $NetBSD: beagleboard.conf,v 1.13 2013/08/17 13:08:16 jmcneill Exp $
+# $NetBSD: beagleboard.conf,v 1.14 2013/08/19 04:27:22 jmcneill Exp $
 # BeagleBoard customization script used by mkimage
 #
 board=beagleboard
 
-kernel="$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub $src/sys/arch/evbarm/compile/obj/BEAGLEBONE/netbsd.ub"
+kernel="$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub"
 
-set -- $kernel
-bboard_kernel=$1
-bbone_kernel=$2
+bboard_kernel="$kernel"
+bbone_kernel="$(echo $bboard_kernel | sed 's/BEAGLEBOARD/BEAGLEBONE/g')"
 
 . ${DIR}/conf/evbarm.conf
 
diff -r 547c8499b4e3 -r 8392ab35b0a4 etc/etc.evbarm/Makefile.inc
--- a/etc/etc.evbarm/Makefile.inc       Mon Aug 19 03:55:12 2013 +0000
+++ b/etc/etc.evbarm/Makefile.inc       Mon Aug 19 04:27:22 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.57 2013/08/17 13:08:16 jmcneill Exp $
+#      $NetBSD: Makefile.inc,v 1.58 2013/08/19 04:27:22 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
@@ -122,8 +122,9 @@
 KERNEL_SETS+=          ${KERNEL_SETS.${arch}}
 .endfor
 
-.if !empty(KERNEL_SETS:MBEAGLEBOARD)
-smp_beagleboard: ${IMAGE.kern}/netbsd-BEAGLEBOARD.ub.gz ${IMAGE.kern}/netbsd-BEAGLEBONE.ub.gz __mkimage
+.if !empty(KERNEL_SETS:MBEAGLEBOARD) && !empty(KERNEL_SETS:MBEAGLEBONE)
+smp_beagleboard: ${IMAGE.kern}/netbsd-BEAGLEBOARD.ub.gz __mkimage
+#            XXX ${IMAGE.kern}/netbsd-BEAGLEBONE.ub.gz
 .if empty(ALL_KERNELS) || (!empty(ALL_KERNELS:MBEAGLEBOARD) && !empty(ALL_KERNELS:MBEAGLEBONE))
 SNAP_MD_POST_DEPS+=    smp_beagleboard
 .endif