Index: sys/arch/evbarm/conf/mk.rpi
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/mk.rpi,v
retrieving revision 1.9
diff -u -p -r1.9 mk.rpi
--- sys/arch/evbarm/conf/mk.rpi	1 Dec 2020 04:18:26 -0000	1.9
+++ sys/arch/evbarm/conf/mk.rpi	28 Apr 2021 06:11:24 -0000
@@ -9,11 +9,18 @@ SYSTEM_FIRST_SFILE=	${ARM}/arm/armv6_sta
 
 _OSRELEASE!=		${HOST_SH} $S/conf/osrelease.sh
 
-KERNEL_BASE_PHYS=0x00008000
-KERNEL_BASE_VIRT=0x80008000
+KERNEL_BASE_PHYS=0x00000040
+KERNEL_BASE_VIRT=0x80000040
+
+MKUBOOTIMAGEARGS=	-A arm -T kernel_noload -O linux -C none
+MKUBOOTIMAGEARGS+=	-e 0
+MKUBOOTIMAGEARGS+=	-n "NetBSD/${BOARDTYPE:U${MACHINE_ARCH}} ${_OSRELEASE}"
 
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${OBJCOPY} -S -O binary $@ $@.img; \
-	${OBJCOPY} -S -O binary $@ $@.img;
+	${OBJCOPY} -S -O binary $@ $@.img; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.img $@.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.img $@.ub
 
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.img@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}