From 43e289df5a2c4330de932f490cd4246878c51247 Mon Sep 17 00:00:00 2001
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Sun, 22 Jul 2018 12:03:17 +0000
Subject: release: Add arm_install_boot to install the commit boot bits

This reduce the per-board arm_install_uboot to just install u-boot.
While here remove the installation of rpi.dtb and rpi2.dtb as we load
them from the UFS partition via ubldr.

Reviewed by:	gjb, imp (older version)
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D16239
---
 release/arm64/PINE64.conf | 21 ---------------------
 release/arm64/RPI3.conf   | 16 +---------------
 2 files changed, 1 insertion(+), 36 deletions(-)

(limited to 'release/arm64')

diff --git a/release/arm64/PINE64.conf b/release/arm64/PINE64.conf
index 74ec1ff22eee..f20dafd5e624 100644
--- a/release/arm64/PINE64.conf
+++ b/release/arm64/PINE64.conf
@@ -19,29 +19,8 @@ export BOARDNAME="PINE64"
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-pine64"
 	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
-	FATMOUNT="${DESTDIR%${KERNEL}}fat"
-	UFSMOUNT="${DESTDIR%${KERNEL}}ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=1k seek=8 conv=sync
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
-	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-
-	BOOTFILES="$(chroot ${CHROOTDIR} \
-	    env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
-	    WITH_UNIFIED_OBJDIR=yes \
-	    make -C ${WORLDDIR}/stand -V .OBJDIR)"
-	BOOTFILES="$(chroot ${CHROOTDIR} realpath ${BOOTFILES})"
-
-	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT
-	chroot ${CHROOTDIR} cp -p ${BOOTFILES}/efi/loader/loader.efi \
-		${FATMOUNT}/EFI/BOOT/bootaa64.efi
-	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
-	sync
-	umount_loop ${CHROOTDIR}/${FATMOUNT}
-	umount_loop ${CHROOTDIR}/${UFSMOUNT}
-	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-	chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
 	
 	return 0
 }
diff --git a/release/arm64/RPI3.conf b/release/arm64/RPI3.conf
index 50ba75155076..22f5de3105e2 100644
--- a/release/arm64/RPI3.conf
+++ b/release/arm64/RPI3.conf
@@ -27,10 +27,8 @@ arm_install_uboot() {
 		fixup_db.dat fixup_x.dat fixup.dat LICENCE.broadcom \
 		start_cd.elf start_db.elf start_x.elf start.elf ${DTB}"
 	FATMOUNT="${DESTDIR%${KERNEL}}fat"
-	UFSMOUNT="${DESTDIR%${KERNEL}}ufs"
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	for _UF in ${UBOOT_FILES}; do
 		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
@@ -47,21 +45,9 @@ arm_install_uboot() {
 			${FATMOUNT}/overlays/${_OL}
 	done
 
-	BOOTFILES="$(chroot ${CHROOTDIR} \
-		env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
-		WITH_UNIFIED_OBJDIR=yes \
-		make -C ${WORLDDIR}/stand -V .OBJDIR)"
-	BOOTFILES="$(chroot ${CHROOTDIR} realpath ${BOOTFILES})"
-
-	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT
-	chroot ${CHROOTDIR} cp -p ${BOOTFILES}/efi/loader/loader.efi \
-		${FATMOUNT}/EFI/BOOT/bootaa64.efi
-	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
-	umount_loop ${CHROOTDIR}/${UFSMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-	chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
 	
 	return 0
 }
-- 
cgit v1.2.3