aboutsummaryrefslogtreecommitdiff
path: root/release/arm64
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2018-04-10 17:40:44 +0000
committerGlen Barber <gjb@FreeBSD.org>2018-04-10 17:40:44 +0000
commit32c434538ad5d0dec3dfe982acc40987fce96208 (patch)
tree5afe289078351ab20370c35c87e830ab15320647 /release/arm64
parent99adcecf383a446e974f85a91096d6aa607824c0 (diff)
downloadsrc-32c434538ad5d0dec3dfe982acc40987fce96208.tar.gz
src-32c434538ad5d0dec3dfe982acc40987fce96208.zip
Following r331292, many of the files (such as the LICENSE file)
have moved from the u-boot-rpi3 share directory to the default rpi-firmware share directory. Remove the files from UBOOT_FILES and append the DTB file to a DTB_FILES list so the correct path is used, fixing a build failure. Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=332384
Diffstat (limited to 'release/arm64')
-rw-r--r--release/arm64/RPI3.conf12
1 files changed, 8 insertions, 4 deletions
diff --git a/release/arm64/RPI3.conf b/release/arm64/RPI3.conf
index 1ed26b0b23bc..090f63a0e2aa 100644
--- a/release/arm64/RPI3.conf
+++ b/release/arm64/RPI3.conf
@@ -22,9 +22,10 @@ export BOARDNAME="RPI3"
arm_install_uboot() {
UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi3"
- UBOOT_FILES="LICENCE.broadcom README armstub8.bin bootcode.bin config.txt \
- fixup.dat fixup_cd.dat fixup_x.dat start.elf start_cd.elf \
- start_x.elf u-boot.bin"
+ UBOOT_FILES="README u-boot.bin"
+ DTB_FILES="armstub8.bin bootcode.bin config.txt fixup_cd.dat \
+ 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}"
@@ -34,7 +35,10 @@ arm_install_uboot() {
chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
${FATMOUNT}/${_UF}
done
- chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${DTB} ${FATMOUNT}/${DTB}
+ for _DF in ${DTB_FILES}; do
+ chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${_DF} \
+ ${FATMOUNT}/${_DF}
+ done
chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
for _OL in ${OVERLAYS}; do
chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \