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
This commit is contained in:
Glen Barber 2018-04-10 17:40:44 +00:00
parent 99adcecf38
commit 32c434538a
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=332384

View file

@ -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} \