diff options
| author | gjb <gjb@FreeBSD.org> | 2017-11-30 15:54:14 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2017-11-30 15:54:14 +0000 |
| commit | 7cf6ec5d55e446c0ba0d9e5cd93fda5aeb82881b (patch) | |
| tree | 458a323146ff7e6e34efba4f27337244c9874e83 | |
| parent | 0b2a3c56aecae9e26b20770d50852ed085d9f2d6 (diff) | |
| download | FreeBSD-src-7cf6ec5d55e446c0ba0d9e5cd93fda5aeb82881b.zip FreeBSD-src-7cf6ec5d55e446c0ba0d9e5cd93fda5aeb82881b.tar.gz | |
Correct a mismerge of r325861, committed as r326017, to fix the
RPI2 SoC image build.
This is a direct commit to stable/11.
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | release/arm/RPI2.conf | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf index 65d6aa0..7b11001 100644 --- a/release/arm/RPI2.conf +++ b/release/arm/RPI2.conf @@ -6,7 +6,7 @@ EMBEDDED_TARGET_ARCH="armv6" EMBEDDED_TARGET="arm" EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-rpi2" +EMBEDDEDPORTS="sysutils/u-boot-rpi2 sysutils/rpi-firmware" FAT_SIZE="50m" FAT_TYPE="16" IMAGE_SIZE="1536M" @@ -18,8 +18,11 @@ WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2" - UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \ - fixup_x.dat start.elf start_cd.elf start_x.elf u-boot.bin" + RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware" + UBOOT_FILES="u-boot.bin" + RPI_FIRMWARE_FILES="bootcode.bin config.txt \ + fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \ + start.elf start_cd.elf start_db.elf start_x.elf" FATMOUNT="${DESTDIR%${KERNEL}}/fat" UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" @@ -29,6 +32,10 @@ arm_install_uboot() { chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \ ${FATMOUNT}/${_UF} done + for _UF in ${RPI_FIRMWARE_FILES}; do + chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \ + ${FATMOUNT}/${_UF} + done chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi2.dtb \ |
