svn commit: r333976 - head/release/arm64

[Emmanuel Vadot]

Author: manu
Date: Mon May 21 11:58:02 2018
New Revision: 333976
URL: https://svnweb.freebsd.org/changeset/base/333976

Log:
  release: arm64: Use loader.efi as bootaa64.efi for RPI3 and PINE64
  
  boot1.efi have some trouble to read MBR partitions, it needs them to be
  aligned a certain way while loader.efi can cope with them either way.
  We want to switch to loader.efi as the main efi loader everywhere, it seems
  that arm64 using MBR partition will be the guinea pig.
  
  Tested On: RPI3, Pine64
  Reviewed by:	imp
  Approved by:	gjb

Modified:
  head/release/arm64/PINE64.conf
  head/release/arm64/RPI3.conf

Modified: head/release/arm64/PINE64.conf
==============================================================================
--- head/release/arm64/PINE64.conf	Mon May 21 11:56:07 2018	(r333975)
+++ head/release/arm64/PINE64.conf	Mon May 21 11:58:02 2018	(r333976)
@@ -34,7 +34,7 @@ arm_install_uboot() {
 	BOOTFILES="$(chroot ${CHROOTDIR} realpath ${BOOTFILES})"
 
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT
-	chroot ${CHROOTDIR} cp -p ${BOOTFILES}/efi/boot1/boot1.efi \
+	chroot ${CHROOTDIR} cp -p ${BOOTFILES}/efi/loader/loader.efi \
 		${FATMOUNT}/EFI/BOOT/bootaa64.efi
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync

Modified: head/release/arm64/RPI3.conf
==============================================================================
--- head/release/arm64/RPI3.conf	Mon May 21 11:56:07 2018	(r333975)
+++ head/release/arm64/RPI3.conf	Mon May 21 11:58:02 2018	(r333976)
@@ -54,7 +54,7 @@ arm_install_uboot() {
 	BOOTFILES="$(chroot ${CHROOTDIR} realpath ${BOOTFILES})"
 
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT
-	chroot ${CHROOTDIR} cp -p ${BOOTFILES}/efi/boot1/boot1.efi \
+	chroot ${CHROOTDIR} cp -p ${BOOTFILES}/efi/loader/loader.efi \
 		${FATMOUNT}/EFI/BOOT/bootaa64.efi
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync