From 58157753285d1e9eb137420de6a82e4d0949f60d Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill@NetBSD.org>
Date: Fri, 18 Jun 2010 19:19:05 +0000
Subject: [PATCH] emit u-boot image 'netbsd.ub' as part of beagle kernel build

---
 sys/arch/evbarm/conf/mk.beagle | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/sys/arch/evbarm/conf/mk.beagle b/sys/arch/evbarm/conf/mk.beagle
index ced86bde167e..2609eded8928 100644
--- a/sys/arch/evbarm/conf/mk.beagle
+++ b/sys/arch/evbarm/conf/mk.beagle
@@ -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:@.KERNEL.@${.KERNEL.}.bin@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}