Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
jmcneill 2013-08-17 13:08:16 +00:00
parent 0cd90176f0
commit 0b185da1b6
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
distrib/utils/embedded/conf/beagleboard.conf
View File

@ -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 # BeagleBoard customization script used by mkimage
# #
board=beagleboard board=beagleboard
bboard_kernel="$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub" kernel="$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub $src/sys/arch/evbarm/compile/obj/BEAGLEBONE/netbsd.ub"
bbone_kernel="$src/sys/arch/evbarm/compile/obj/BEAGLEBONE/netbsd.ub"
set -- $kernel
bboard_kernel=$1
bbone_kernel=$2
. ${DIR}/conf/evbarm.conf . ${DIR}/conf/evbarm.conf

8
etc/etc.evbarm/Makefile.inc
View File

@ -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 # etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
# #
@ -93,7 +93,7 @@ __mkimage: .USE
TOOL_MTREE=${TOOL_MTREE} \ TOOL_MTREE=${TOOL_MTREE} \
HOST_SH=${HOST_SH} \ HOST_SH=${HOST_SH} \
${HOST_SH} ${MKIMAGE} -x -h ${.TARGET:S/smp_//} -D ${DESTDIR} \ ${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 ${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz
ARCHES.arm= armv4 xscale armv5t armv6 armv7 ARCHES.arm= armv4 xscale armv5t armv6 armv7
@ -123,8 +123,8 @@ KERNEL_SETS+= ${KERNEL_SETS.${arch}}
.endfor .endfor
.if !empty(KERNEL_SETS:MBEAGLEBOARD) .if !empty(KERNEL_SETS:MBEAGLEBOARD)
smp_beagleboard: ${IMAGE.kern}/netbsd-BEAGLEBOARD.ub.gz __mkimage smp_beagleboard: ${IMAGE.kern}/netbsd-BEAGLEBOARD.ub.gz ${IMAGE.kern}/netbsd-BEAGLEBONE.ub.gz __mkimage
.if empty(ALL_KERNELS) || !empty(ALL_KERNELS:MBEAGLEBOARD) .if empty(ALL_KERNELS) || (!empty(ALL_KERNELS:MBEAGLEBOARD) && !empty(ALL_KERNELS:MBEAGLEBONE))
SNAP_MD_POST_DEPS+= smp_beagleboard SNAP_MD_POST_DEPS+= smp_beagleboard
.endif .endif
.endif .endif