aboutsummaryrefslogtreecommitdiff
path: root/release/arm64
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2018-07-22 12:03:17 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2018-07-22 12:03:17 +0000
commit43e289df5a2c4330de932f490cd4246878c51247 (patch)
tree3061c92b508e8f7416fc7aedf7937ed3dddce1b2 /release/arm64
parent1f8b431d185416f70e96f03b8fd69b98442b1913 (diff)
downloadsrc-43e289df5a2c4330de932f490cd4246878c51247.tar.gz
src-43e289df5a2c4330de932f490cd4246878c51247.zip
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
Notes
Notes: svn path=/head/; revision=336599
Diffstat (limited to 'release/arm64')
-rw-r--r--release/arm64/PINE64.conf21
-rw-r--r--release/arm64/RPI3.conf16
2 files changed, 1 insertions, 36 deletions
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
}