Previously armv7 ramdisk creation would tar up the mdec directory on the

build machine and extract it when installing.  Change to using the
u-boot and dtb packages when creating ramdisks and miniroots and don't
place these files in mdec on install.

Installing these packages is now required to run make release on armv7.

4 files changed, 72 insertions, 17 deletions

diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc
index 8c29936fb19..3c63d18dc84 100644
--- a/distrib/armv7/miniroot/Makefile.inc
+++ b/distrib/armv7/miniroot/Makefile.inc
@@ -27,6 +27,9 @@ PART_ID?=C
 NEWFS_ARGS_msdos=-L boot
 MOUNT_ARGS_msdos=-o-l
 
+PDTB=		/usr/local/share/dtb/arm
+PUBOOT=		/usr/local/share/u-boot
+
 cleandir: clean
 clean:
 	rm -f ${IMAGE}
@@ -47,22 +50,18 @@ do_files:
 	ln ${MOUNT_POINT}/bsd.rd ${MOUNT_POINT}/bsd
 	-umount ${MOUNT_POINT}
 	mount ${MOUNT_ARGS_msdos} ${VND_IDEV} ${MOUNT_POINT}
+.for DTB in ${DTBS}
+	cp ${PDTB}/${DTB} ${MOUNT_POINT}/
+.endfor
 .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"
-	cp /usr/mdec/${BOARD}/*.dtb ${MOUNT_POINT}/
+	cp ${PUBOOT}/${UBOOT}/{MLO,u-boot.img} ${MOUNT_POINT}/
 .endif
 .if ${BOARD} == "cubox" || ${BOARD} == "wandboard"
-	cp /usr/mdec/${BOARD}/*.dtb ${MOUNT_POINT}/
-	dd if=/usr/mdec/${BOARD}/SPL of=${VND_CDEV} bs=1024 seek=1
-	dd if=/usr/mdec/${BOARD}/u-boot.img of=${VND_CDEV} bs=1024 seek=69
+	dd if=${PUBOOT}/${UBOOT}/SPL of=${VND_CDEV} bs=1024 seek=1
+	dd if=${PUBOOT}/${UBOOT}/u-boot.img of=${VND_CDEV} bs=1024 seek=69
 .endif
 .if ${PLATFORM} == "SUNXI"
-	cp /usr/mdec/${BOARD}/*.dtb ${MOUNT_POINT}/
-	dd if=/usr/mdec/${BOARD}/u-boot-sunxi-with-spl.bin \
+	dd if=${PUBOOT}/${UBOOT}/u-boot-sunxi-with-spl.bin \
 	    of=${VND_CDEV} bs=1024 seek=8
 .endif
 	mkdir -p ${MOUNT_POINT}/efi/boot
diff --git a/distrib/armv7/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile
index 2c45c7c28d1..eda91e23793 100644
--- a/distrib/armv7/ramdisk/Makefile
+++ b/distrib/armv7/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.13 2016/05/29 07:38:01 jsg Exp $
+#	$OpenBSD: Makefile,v 1.14 2016/06/05 15:12:56 jsg Exp $
 
 REV=	${OSrev}
 
@@ -26,6 +26,15 @@ NBLKS=		15360
 # minfree, opt, b/i  trks, sects, cpg
 NEWFSARGS= -m 0 -o space -i 4096
 
+DIRS=\
+	am335x \
+	beagle \
+	cubie \
+	cubox \
+	nitrogen \
+	panda \
+	wandboard
+
 .ifndef DESTDIR
 all ${IMAGE}:
 	@echo setenv DESTDIR before making a ramdisk!
@@ -84,6 +93,9 @@ ${CRUNCHCONF}: ${LISTS}
 	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
 
 do_files:
+.for DIR in ${DIRS}
+	mkdir -p ${MOUNT_POINT}/usr/mdec/${DIR}
+.endfor
 	cat ${MTREE} | mtree -de -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index 1372cf80358..f58990893e0 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.37 2016/06/03 23:50:21 jsg Exp $
+#	$OpenBSD: install.md,v 1.38 2016/06/05 15:12:56 jsg Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -55,11 +55,10 @@ md_installboot() {
 
 	# Mount MSDOS partition, extract U-Boot and copy UEFI boot program
 	mount ${MOUNT_ARGS_msdos} ${_disk}i /mnt/mnt
-	tar -C /mnt/ -xf /usr/mdec/u-boots.tgz 
 	mkdir -p /mnt/mnt/efi/boot
 	cp /mnt/usr/mdec/BOOTARM.EFI /mnt/mnt/efi/boot/bootarm.efi
 
-	_mdec=/mnt/usr/mdec/$_plat
+	_mdec=/usr/mdec/$_plat
 
 	case $_plat in
 	am335x|beagle|panda)
diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index 19fc1152da0..2bf9c56ee0e 100644
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.20 2016/04/29 11:19:33 patrick Exp $
+#	$OpenBSD: list,v 1.21 2016/06/05 15:12:56 jsg Exp $
 
 SRCDIRS distrib/special
 
@@ -113,6 +113,51 @@ SPECIAL	chmod 755 install.sub
 SYMLINK	install.sub				autoinstall
 SYMLINK	install.sub				install
 SYMLINK	install.sub				upgrade
-SPECIAL	tar cvf usr/mdec/u-boots.tgz /usr/mdec/
+
+# u-boot and dtbs
+COPY	/usr/local/share/u-boot/am335x_boneblack/MLO	/usr/mdec/am335x/MLO
+COPY	/usr/local/share/u-boot/am335x_boneblack/u-boot.img	/usr/mdec/am335x/u-boot.img
+COPY	/usr/local/share/dtb/arm/am335x-bone.dtb	/usr/mdec/am335x/am335x-bone.dtb
+COPY	/usr/local/share/dtb/arm/am335x-boneblack.dtb	/usr/mdec/am335x/am335x-boneblack.dtb
+COPY	/usr/local/share/dtb/arm/am335x-bonegreen.dtb	/usr/mdec/am335x/am335x-bonegreen.dtb
+COPY	/usr/local/share/dtb/arm/am335x-evm.dtb		/usr/mdec/am335x/am335x-evm.dtb
+COPY	/usr/local/share/dtb/arm/am335x-evmsk.dtb	/usr/mdec/am335x/am335x-evmsk.dtb
+
+COPY	/usr/local/share/u-boot/omap3_beagle/MLO	/usr/mdec/beagle/MLO
+COPY	/usr/local/share/u-boot/omap3_beagle/u-boot.img	/usr/mdec/beagle/u-boot.img
+COPY	/usr/local/share/dtb/arm/omap3-beagle-xm-ab.dtb	/usr/mdec/beagle/omap3-beagle-xm-ab.dtb
+COPY	/usr/local/share/dtb/arm/omap3-beagle-xm.dtb	/usr/mdec/beagle/omap3-beagle-xm.dtb
+COPY	/usr/local/share/dtb/arm/omap3-beagle.dtb	/usr/mdec/beagle/omap3-beagle.dtb
+
+COPY	/usr/local/share/u-boot/Cubieboard/u-boot-sunxi-with-spl.bin	/usr/mdec/cubie/u-boot-sunxi-with-spl.bin
+COPY	/usr/local/share/dtb/arm/sun4i-a10-cubieboard.dtb	/usr/mdec/cubie/sun4i-a10-cubieboard.dtb
+
+COPY	/usr/local/share/u-boot/omap4_panda/MLO		/usr/mdec/panda/MLO
+COPY	/usr/local/share/u-boot/omap4_panda/u-boot.img	/usr/mdec/panda/u-boot.img
+COPY	/usr/local/share/dtb/arm/omap4-duovero-parlor.dtb	/usr/mdec/panda/omap4-duovero-parlor.dtb
+COPY	/usr/local/share/dtb/arm/omap4-panda-a4.dtb	/usr/mdec/panda/omap4-panda-a4.dtb
+COPY	/usr/local/share/dtb/arm/omap4-panda-es.dtb	/usr/mdec/panda/omap4-panda-es.dtb
+COPY	/usr/local/share/dtb/arm/omap4-panda.dtb	/usr/mdec/panda/omap4-panda.dtb
+COPY	/usr/local/share/dtb/arm/omap4-sdp.dtb		/usr/mdec/panda/omap4-sdp.dtb
+
+COPY	/usr/local/share/u-boot/mx6cuboxi/SPL		/usr/mdec/cubox/SPL
+COPY	/usr/local/share/u-boot/mx6cuboxi/u-boot.img	/usr/mdec/cubox/u-boot.img
+COPY	/usr/local/share/dtb/arm/imx6dl-cubox-i.dtb	/usr/mdec/cubox/imx6dl-cubox-i.dtb
+COPY	/usr/local/share/dtb/arm/imx6dl-hummingboard.dtb	/usr/mdec/cubox/imx6dl-hummingboard.dtb
+COPY	/usr/local/share/dtb/arm/imx6q-cubox-i.dtb	/usr/mdec/cubox/imx6q-cubox-i.dtb
+COPY	/usr/local/share/dtb/arm/imx6q-hummingboard.dtb	/usr/mdec/cubox/imx6q-hummingboard.dtb
+
+COPY	/usr/local/share/dtb/arm/imx6dl-nitrogen6x.dtb	/usr/mdec/nitrogen/imx6dl-nitrogen6x.dtb
+COPY	/usr/local/share/dtb/arm/imx6dl-sabrelite.dtb	/usr/mdec/nitrogen/imx6dl-sabrelite.dtb
+COPY	/usr/local/share/dtb/arm/imx6q-nitrogen6_max.dtb	/usr/mdec/nitrogen/imx6q-nitrogen6_max.dtb
+COPY	/usr/local/share/dtb/arm/imx6q-nitrogen6x.dtb	/usr/mdec/nitrogen/imx6q-nitrogen6x.dtb
+COPY	/usr/local/share/dtb/arm/imx6q-sabrelite.dtb	/usr/mdec/nitrogen/imx6q-sabrelite.dtb
+
+COPY	/usr/local/share/u-boot/wandboard/SPL		/usr/mdec/wandboard/SPL
+COPY	/usr/local/share/u-boot/wandboard/u-boot.img	/usr/mdec/wandboard/u-boot.img
+COPY	/usr/local/share/dtb/arm/imx6dl-wandboard-revb1.dtb	/usr/mdec/wandboard/imx6dl-wandboard-revb1.dtb
+COPY	/usr/local/share/dtb/arm/imx6dl-wandboard.dtb	/usr/mdec/wandboard/imx6dl-wandboard.dtb
+COPY	/usr/local/share/dtb/arm/imx6q-wandboard-revb1.dtb	/usr/mdec/wandboard/imx6q-wandboard-revb1.dtb
+COPY	/usr/local/share/dtb/arm/imx6q-wandboard.dtb	/usr/mdec/wandboard/imx6q-wandboard.dtb
 
 TZ