diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2018-05-21 11:58:02 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2018-05-21 11:58:02 +0000 |
| commit | 785724755a740ee7f1521db49508be637451d591 (patch) | |
| tree | e8d7941da1640ded47f8fb82648cb2c44bc09db5 /release/arm64 | |
| parent | 15f8acc53f5d936e0d5729db9894301e6db86353 (diff) | |
| download | src-785724755a740ee7f1521db49508be637451d591.tar.gz src-785724755a740ee7f1521db49508be637451d591.zip | |
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
Notes
Notes:
svn path=/head/; revision=333976
Diffstat (limited to 'release/arm64')
| -rw-r--r-- | release/arm64/PINE64.conf | 2 | ||||
| -rw-r--r-- | release/arm64/RPI3.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/arm64/PINE64.conf b/release/arm64/PINE64.conf index 58124a21af60..74ec1ff22eee 100644 --- a/release/arm64/PINE64.conf +++ b/release/arm64/PINE64.conf @@ -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 diff --git a/release/arm64/RPI3.conf b/release/arm64/RPI3.conf index 3063473407de..50ba75155076 100644 --- a/release/arm64/RPI3.conf +++ b/release/arm64/RPI3.conf @@ -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 |