Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 22 Jul 2018 12:04:21 +0000 (UTC)
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r336600 - head/release/arm
Message-ID:  <201807221204.w6MC4La8007693@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: manu
Date: Sun Jul 22 12:04:21 2018
New Revision: 336600
URL: https://svnweb.freebsd.org/changeset/base/336600

Log:
  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

Modified:
  head/release/arm/RPI-B.conf
  head/release/arm/RPI2.conf

Modified: head/release/arm/RPI-B.conf
==============================================================================
--- head/release/arm/RPI-B.conf	Sun Jul 22 12:03:17 2018	(r336599)
+++ head/release/arm/RPI-B.conf	Sun Jul 22 12:04:21 2018	(r336600)
@@ -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}
@@ -32,6 +35,11 @@ arm_install_uboot() {
 	for _UF in ${RPI_FIRMWARE_FILES}; do
 		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

Modified: head/release/arm/RPI2.conf
==============================================================================
--- head/release/arm/RPI2.conf	Sun Jul 22 12:03:17 2018	(r336599)
+++ head/release/arm/RPI2.conf	Sun Jul 22 12:04:21 2018	(r336600)
@@ -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}
@@ -33,6 +35,11 @@ arm_install_uboot() {
 	for _UF in ${RPI_FIRMWARE_FILES}; do
 		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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807221204.w6MC4La8007693>