From 3d613b21b08ff709d218de7fab0a2d9443932c17 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 5 Jul 2023 18:46:14 +0200 Subject: [PATCH] board/raspberrypi: handle dtb overlays for all variants Most rpi defconfigs use dtb overlays, but not rpi0 / rpi2 - Making it harder to use overlays on those boards as the genimage files have to be tweaked. To fix this, create the rpi-firmware/overlays directory in the post-build script if needed and unconditionally include it in the genimage files so rpi0/rpi2 works consistently with the other variants. Signed-off-by: Peter Korsgaard (cherry picked from commit 6021f3678b44d43da7057e3135da842cde1ffa05) Signed-off-by: Peter Korsgaard --- board/raspberrypi/genimage-raspberrypi0.cfg | 1 + board/raspberrypi/genimage-raspberrypi2.cfg | 1 + board/raspberrypi/post-build.sh | 3 +++ 3 files changed, 5 insertions(+) diff --git a/board/raspberrypi/genimage-raspberrypi0.cfg b/board/raspberrypi/genimage-raspberrypi0.cfg index 1fa3f5096f..313f85f651 100644 --- a/board/raspberrypi/genimage-raspberrypi0.cfg +++ b/board/raspberrypi/genimage-raspberrypi0.cfg @@ -7,6 +7,7 @@ image boot.vfat { "rpi-firmware/config.txt", "rpi-firmware/fixup.dat", "rpi-firmware/start.elf", + "rpi-firmware/overlays", "zImage" } } diff --git a/board/raspberrypi/genimage-raspberrypi2.cfg b/board/raspberrypi/genimage-raspberrypi2.cfg index acd23e7ca8..dad9275537 100644 --- a/board/raspberrypi/genimage-raspberrypi2.cfg +++ b/board/raspberrypi/genimage-raspberrypi2.cfg @@ -7,6 +7,7 @@ image boot.vfat { "rpi-firmware/config.txt", "rpi-firmware/fixup.dat", "rpi-firmware/start.elf", + "rpi-firmware/overlays", "zImage" } } diff --git a/board/raspberrypi/post-build.sh b/board/raspberrypi/post-build.sh index 5e5eb71100..b24256fcea 100755 --- a/board/raspberrypi/post-build.sh +++ b/board/raspberrypi/post-build.sh @@ -9,3 +9,6 @@ if [ -e ${TARGET_DIR}/etc/inittab ]; then sed -i '/GENERIC_SERIAL/a\ tty1::respawn:/sbin/getty -L tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab fi + +# exnsure overlays exists for genimage +mkdir -p "${BINARIES_DIR}/rpi-firmware/overlays"