Module Name: src
Committed By: jmcneill
Date: Mon Aug 19 04:27:22 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf
src/etc/etc.evbarm: Makefile.inc
Log Message:
Instead of trying to pass two kernels to beagleboard.conf, pass one and
derive the path to the second from the first.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/embedded/conf/beagleboard.conf
cvs rdiff -u -r1.57 -r1.58 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.13 src/distrib/utils/embedded/conf/beagleboard.conf:1.14
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.13 Sat Aug 17 13:08:16 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Mon Aug 19 04:27:22 2013
@@ -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
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.57 src/etc/etc.evbarm/Makefile.inc:1.58
--- src/etc/etc.evbarm/Makefile.inc:1.57 Sat Aug 17 13:08:16 2013
+++ src/etc/etc.evbarm/Makefile.inc Mon Aug 19 04:27:22 2013
@@ -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 @@ __mkimage: .USE
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 @@ BUILD_KERNELS+= ${board}_INSTALL
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
