From c5a6df171185897c7bb172b0fd40f9347698d8ca Mon Sep 17 00:00:00 2001 From: Gijs Peskens Date: Mon, 23 Dec 2024 13:24:06 +0100 Subject: [PATCH] raspberrypi5.conf: Fix boot kernel panic on CM5 The Raspberry Compute Module 5 needs new dtb's and depends on the bcm2712d0 overlay. Signed-off-by: Gijs Peskens --- conf/machine/raspberrypi5.conf | 6 ++++++ recipes-bsp/u-boot/u-boot_%.bbappend | 3 +++ 2 files changed, 9 insertions(+) diff --git a/conf/machine/raspberrypi5.conf b/conf/machine/raspberrypi5.conf index 03f15c35..63e8830c 100644 --- a/conf/machine/raspberrypi5.conf +++ b/conf/machine/raspberrypi5.conf @@ -15,6 +15,10 @@ MACHINE_EXTRA_RRECOMMENDS += "\ RPI_KERNEL_DEVICETREE = " \ broadcom/bcm2712-rpi-5-b.dtb \ + broadcom/bcm2712-rpi-cm5-cm5io.dtb \ + broadcom/bcm2712-rpi-cm5-cm4io.dtb \ + broadcom/bcm2712-rpi-cm5l-cm5io.dtb \ + broadcom/bcm2712-rpi-cm5l-cm4io.dtb \ " SDIMG_KERNELIMAGE ?= "kernel_2712.img" @@ -30,3 +34,5 @@ KERNEL_IMAGETYPE_DIRECT ?= "Image" KERNEL_BOOTCMD ?= "booti" UBOOT_MACHINE = "rpi_arm64_config" + +RPI_KERNEL_DEVICETREE_OVERLAYS:append = " overlays/bcm2712d0.dtbo" diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 8c707b56..52cfb1fb 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -6,6 +6,9 @@ SRC_URI:append:rpi = " \ SRC_URI:append:rpi = " file://0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch" + +SRC_URI:append:rpi = " file://memory_size.cfg" + DEPENDS:append:rpi = " u-boot-default-script" do_install:append:rpi () {