Try to pick up the right location for BEAGLEBONE and BEAGLEBOARD kernels.
This commit is contained in:
parent
0cd90176f0
commit
0b185da1b6
|
@ -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
|
||||
|
||||
|
|
|
@ -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 @@ __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
|
||||
|
@ -123,8 +123,8 @@ KERNEL_SETS+= ${KERNEL_SETS.${arch}}
|
|||
.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
|
||||
|
|
Loading…
Reference in New Issue