use efiboot in armv7 miniroot images

2 files changed, 24 insertions, 29 deletions

diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc
index 2ec29bcf201..dcd1eed8ce4 100644
--- a/distrib/armv7/miniroot/Makefile.inc
+++ b/distrib/armv7/miniroot/Makefile.inc
@@ -15,12 +15,16 @@ VND_CRDEV=	/dev/r${VND}c
 VND_RIDEV=	/dev/r${VND}i
 PID!=		echo $$$$
 
+DISKTYPE=	miniroot
 NBLKS=		36864
+MSDOSSTART=	2048
+MSDOSSIZE=	4096
+FFSSTART!=	expr ${MSDOSSTART} + ${MSDOSSIZE}
 
 FS?=		msdos
 PART_ID?=C
 
-NEWFS_ARGS_msdos=-F 16 -L boot
+NEWFS_ARGS_msdos=-L boot
 MOUNT_ARGS_msdos=-o-l
 
 cleandir: clean
@@ -39,15 +43,18 @@ ${IMAGE}: rd_setup do_files rd_teardown
 .endif
 
 do_files:
-	${MKUBOOT} -t script -a arm -o linux \
-	    ${.CURDIR}/../boot.cmd ${MOUNT_POINT}/boot.scr
+	cp ${.OBJDIR}/../../ramdisk/bsd.rd ${MOUNT_POINT}/bsd.rd
+	ln ${MOUNT_POINT}/bsd.rd ${MOUNT_POINT}/bsd
+	-umount ${MOUNT_POINT}
+	mount ${MOUNT_ARGS_msdos} ${VND_IDEV} ${MOUNT_POINT}
 .if ${PLATFORM} == "OMAP"
 	cp /usr/mdec/${BOARD}/MLO ${MOUNT_POINT}/MLO
 	cp /usr/mdec/${BOARD}/u-boot.* ${MOUNT_POINT}/
 	cp /usr/mdec/${BOARD}/*.dtb ${MOUNT_POINT}/
 .endif
 .if ${BOARD} == "nitrogen"
-	mv ${MOUNT_POINT}/boot.scr ${MOUNT_POINT}/6x_bootscript
+	${MKUBOOT} -t script -a arm -o linux \
+	    ${.CURDIR}/../boot.cmd ${MOUNT_POINT}/6x_bootscript
 .endif
 .if ${BOARD} == "cubox" || ${BOARD} == "wandboard"
 	cp /usr/mdec/${BOARD}/*.dtb ${MOUNT_POINT}/
@@ -59,16 +66,19 @@ do_files:
 	dd if=/usr/mdec/${BOARD}/u-boot-sunxi-with-spl.bin \
 	    of=${VND_CDEV} bs=1024 seek=8
 .endif
-	cp ${.OBJDIR}/../../ramdisk/bsd.rd.${PLATFORM}.umg ${MOUNT_POINT}/bsd.umg
+	mkdir -p ${MOUNT_POINT}/efi/boot
+	cp /usr/mdec/BOOTARM.EFI ${MOUNT_POINT}/efi/boot/bootarm.efi
 
 rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
-	vnconfig -c ${VND} ${IMAGE}
-	fdisk -c 2 -h 255 -s 63 -yi ${VND} >/dev/null
-	echo "u\ne 3\n0\ne 0\n${PART_ID}\ny\n0\n32\n33\n1\n254\n63\n63\nf 0\nw\nq" \
-	    | fdisk -c 2 -h 255 -s 63 -e ${VND} >/dev/null
-	newfs_${FS} ${NEWFS_ARGS_${FS}} ${VND_RIDEV} >/dev/null
-	mount ${MOUNT_ARGS_${FS}} ${VND_IDEV} ${MOUNT_POINT}
+	vnconfig -v -c -t ${DISKTYPE} ${VND} ${IMAGE}
+	echo 'u\ne 0\n${PART_ID}\nn\n${MSDOSSTART}\n${MSDOSSIZE}\ne 3\nA6\nn\n${FFSSTART}\n*\nw\nq\n' \
+	    | fdisk -e ${VND} >/dev/null
+	echo 'a a\n\n\n\nw\nq\n' | disklabel -E ${VND} >/dev/null
+	newfs -t msdos ${NEWFS_ARGS_msdos} ${VND_RIDEV}
+	newfs -m 0 -o space -i 4096 ${VND_RDEV}
+	fsck ${VND_RDEV}
+	mount ${VND_DEV} ${MOUNT_POINT}
 
 rd_teardown:
 	@df -i ${MOUNT_POINT}
diff --git a/etc/etc.armv7/disktab b/etc/etc.armv7/disktab
index c596ba0c29e..9df78ad806d 100644
--- a/etc/etc.armv7/disktab
+++ b/etc/etc.armv7/disktab
@@ -1,4 +1,4 @@
-# $OpenBSD: disktab,v 1.5 2016/05/21 07:19:24 jsg Exp $
+# $OpenBSD: disktab,v 1.6 2016/05/28 10:00:55 jsg Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
@@ -6,21 +6,6 @@ rdroot|ramdiskroot|RAM-disk root FS image:\
 	:ta=4.2BSD:oa#0:pa#15360:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#15360:
 
-
-rdroot2.5M|ramdiskroot2.5M|RAM-disk root FS image:\
-	:dt=rdroot:se#512:nc#16:nt#2:ns#160:\
-	:oa#0:pa#5120:ta=4.2BSD:fa#512:ba#4096:\
-	:ob#0:pb#0:tb=swap:\
-	:oc#0:pc#5120:
-
-# pseudo-geometry taken from rd794
 miniroot:\
-	:dt=rdroot:ns#16:nt#7:nc#968:\
-	:pa#10240:ba#8192:fa#1024:
-
-floppy|floppy3|3in|3.5in High Density Floppy:\
-	:dt=floppy:se#512:nt#2:ns#18:nc#80:\
-	:pa#2880:oa#0:ba#4096:fa#512:\
-	:pb#2880:ob#0:\
-	:pc#2880:oc#0:
-
+	:dt=rdroot:se#512:nc#9:nt#16:ns#256:\
+	:oc#0:pc#36864: