Author: kevans
Date: Mon Dec 9 15:30:12 2019
New Revision: 355559
URL: https://svnweb.freebsd.org/changeset/base/355559
Log:
MFC r355424: release: chase ports r519089 (rpi-firmware update)
Modified:
stable/12/release/arm/RPI-B.conf
stable/12/release/arm64/RPI3.conf
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/release/arm/RPI-B.conf
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/release/arm/RPI-B.conf
==============================================================================
--- stable/12/release/arm/RPI-B.conf Mon Dec 9 15:23:05 2019
(r355558)
+++ stable/12/release/arm/RPI-B.conf Mon Dec 9 15:30:12 2019
(r355559)
@@ -16,7 +16,7 @@ NODOC=1
UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"
RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
OL_DIR="${RPI_FIRMWARE_DIR}/overlays"
-OVERLAYS="mmc.dtbo pi3-disable-bt.dtbo"
+OVERLAYS="mmc.dtbo disable-bt.dtbo"
PART_SCHEME="MBR"
export BOARDNAME="RPI-B"
@@ -25,8 +25,8 @@ arm_install_uboot() {
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 \
- bcm2708-rpi-0-w.dtb bcm2708-rpi-b-plus.dtb bcm2708-rpi-b.dtb \
- bcm2708-rpi-cm.dtb"
+ bcm2708-rpi-zero-w.dtb bcm2708-rpi-b-plus.dtb \
+ bcm2708-rpi-b.dtb bcm2708-rpi-cm.dtb"
FATMOUNT="${DESTDIR%${KERNEL}}/fat"
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
Modified: stable/12/release/arm64/RPI3.conf
==============================================================================
--- stable/12/release/arm64/RPI3.conf Mon Dec 9 15:23:05 2019
(r355558)
+++ stable/12/release/arm64/RPI3.conf Mon Dec 9 15:30:12 2019
(r355559)
@@ -4,7 +4,7 @@
#
DTB_DIR="/usr/local/share/rpi-firmware"
-DTB="bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb"
+DTB="bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb bcm2711-rpi-4-b.dtb"
EMBEDDED_TARGET_ARCH="aarch64"
EMBEDDED_TARGET="arm64"
EMBEDDEDBUILD=1
@@ -16,14 +16,14 @@ KERNEL="GENERIC"
MD_ARGS="-x 63 -y 255"
NODOC=1
OL_DIR="${DTB_DIR}/overlays"
-OVERLAYS="mmc.dtbo pwm.dtbo pi3-disable-bt.dtbo"
+OVERLAYS="mmc.dtbo pwm.dtbo disable-bt.dtbo"
PART_SCHEME="MBR"
export BOARDNAME="RPI3"
arm_install_uboot() {
UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi3"
UBOOT_FILES="README u-boot.bin"
- DTB_FILES="armstub8.bin bootcode.bin fixup_cd.dat \
+ DTB_FILES="armstub8.bin armstub8-gic.bin bootcode.bin 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"
@@ -37,6 +37,8 @@ arm_install_uboot() {
chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${_DF} \
${FATMOUNT}/${_DF}
done
+ chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi4.txt \
+ ${FATMOUNT}
chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi3.txt \
${FATMOUNT}/config.txt
chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
