Author: gjb
Date: Thu Nov 30 15:54:14 2017
New Revision: 326404
URL: https://svnweb.freebsd.org/changeset/base/326404
Log:
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
Modified:
stable/11/release/arm/RPI2.conf
Modified: stable/11/release/arm/RPI2.conf
==============================================================================
--- stable/11/release/arm/RPI2.conf Thu Nov 30 15:48:35 2017
(r326403)
+++ stable/11/release/arm/RPI2.conf Thu Nov 30 15:54:14 2017
(r326404)
@@ -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}"
@@ -27,6 +30,10 @@ arm_install_uboot() {
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
for _UF in ${UBOOT_FILES}; do
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 \
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
