aboutsummaryrefslogtreecommitdiff
path: root/release/arm
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2018-07-22 12:04:21 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2018-07-22 12:04:21 +0000
commit016ba8247068afdb651ecdaea95d095e09ed4eb1 (patch)
tree08f7d650e4f55aab5bbcd018607e3ee2165d47cb /release/arm
parent43e289df5a2c4330de932f490cd4246878c51247 (diff)
downloadsrc-016ba8247068afdb651ecdaea95d095e09ed4eb1.tar.gz
src-016ba8247068afdb651ecdaea95d095e09ed4eb1.zip
release: Add rpi firmware dtb and mmc overlays for RPI-B and RPI2
This is needed with new u-boot that uses the rpi-firmware dtbs. Reviewed by: gjb MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D16240
Notes
Notes: svn path=/head/; revision=336600
Diffstat (limited to 'release/arm')
-rw-r--r--release/arm/RPI-B.conf10
-rw-r--r--release/arm/RPI2.conf9
2 files changed, 17 insertions, 2 deletions
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index ba32862ecfd6..9f2571380161 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -13,6 +13,7 @@ IMAGE_SIZE="3072M"
KERNEL="RPI-B"
MD_ARGS="-x 63 -y 255"
NODOC=1
+OVERLAYS="mmc.dtbo pi3-disable-bt.dtbo"
PART_SCHEME="MBR"
arm_install_uboot() {
@@ -21,7 +22,9 @@ arm_install_uboot() {
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"
+ 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"
FATMOUNT="${DESTDIR%${KERNEL}}/fat"
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
@@ -33,6 +36,11 @@ arm_install_uboot() {
chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \
${FATMOUNT}/${_UF}
done
+ chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
+ for _OL in ${OVERLAYS}; do
+ chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \
+ ${FATMOUNT}/overlays/${_OL}
+ done
chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index c9e8db077ccf..769deea0b5d5 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -13,6 +13,7 @@ IMAGE_SIZE="3072M"
KERNEL="GENERIC"
MD_ARGS="-x 63 -y 255"
NODOC=1
+OVERLAYS="mmc.dtbo"
PART_SCHEME="MBR"
export BOARDNAME="RPI2"
@@ -22,7 +23,8 @@ arm_install_uboot() {
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"
+ start.elf start_cd.elf start_db.elf start_x.elf \
+ bcm2709-rpi-2-b.dtb"
FATMOUNT="${DESTDIR%${KERNEL}}/fat"
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
@@ -34,6 +36,11 @@ arm_install_uboot() {
chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \
${FATMOUNT}/${_UF}
done
+ chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
+ for _OL in ${OVERLAYS}; do
+ chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \
+ ${FATMOUNT}/overlays/${_OL}
+ done
chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}