CVS commit: src/sys/arch/evbarm/conf

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Fri Jun 18 19:19:06 UTC 2010

Modified Files:
        src/sys/arch/evbarm/conf: mk.beagle

Log Message:
emit u-boot image 'netbsd.ub' as part of beagle kernel build


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.beagle

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/evbarm/conf/mk.beagle
diff -u src/sys/arch/evbarm/conf/mk.beagle:1.2 src/sys/arch/evbarm/conf/mk.beagle:1.3
--- src/sys/arch/evbarm/conf/mk.beagle:1.2	Tue Oct 28 17:19:37 2008
+++ src/sys/arch/evbarm/conf/mk.beagle	Fri Jun 18 19:19:05 2010
@@ -1,15 +1,30 @@
-#	$NetBSD: mk.beagle,v 1.2 2008/10/28 17:19:37 matt Exp $
+#	$NetBSD: mk.beagle,v 1.3 2010/06/18 19:19:05 jmcneill Exp $
 # gcc doesn't know about cortex-a8
 CPPFLAGS+= -mcpu=arm1136jf-s
 
 SYSTEM_FIRST_OBJ=	beagle_start.o
 SYSTEM_FIRST_SFILE=	${THISARM}/beagle/beagle_start.S
 
+_OSRELEASE!=		${HOST_SH} $S/conf/osrelease.sh
+
+.if ${USETOOLS} == "yes"
+MKUBOOTIMAGE=		${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
+.else
+MKUBOOTIMAGE=		mkubootimage
+.endif
+MKUBOOTIMAGEARGS=	-A arm -T kernel -C none
+MKUBOOTIMAGEARGS+=	-a $(LOADADDRESS) -e $(LOADADDRESS)
+MKUBOOTIMAGEARGS+=	-n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+
 KERNEL_BASE_PHYS=$(LOADADDRESS)
 KERNEL_BASE_VIRT=$(LOADADDRESS)
 
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${OBJCOPY} -S -O binary $@ $...@.bin; \
 	${OBJCOPY} -S -O binary $@ $...@.bin; \
+	echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $...@.bin $...@.ub; \
+	${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $...@.bin $...@.ub; \
+	echo 
 
 EXTRA_KERNELS+= ${KERNELS:@.kern...@${.kernel.}.bin@}
+EXTRA_KERNELS+= ${KERNELS:@.kern...@${.kernel.}.ub@}