Add CM5 device tree files

This is untested, but should make it more likely for CM5's to work when people start getting them.
gworkman · Nov 29, 2024 · bec066a · bec066a
1 parent 5a8d937
commit bec066a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/fwup.conf b/fwup.conf
@@ -25,6 +25,12 @@ file-resource kernel8.img {
 file-resource bcm2712-rpi-5-b.dtb {
     host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-5-b.dtb"
 }
+file-resource bcm2712-rpi-cm5l-cm4io.dtb {
+    host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5l-cm4io.dtb"
+}
+file-resource bcm2712-rpi-cm5l-cm5io.dtb {
+    host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5l-cm5io.dtb"
+}
 file-resource overlay_map.dtb {
     host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/overlay_map.dtb"
 }
@@ -179,6 +185,8 @@ task complete {
     on-resource fixup4.dat { fat_write(${BOOT_A_PART_OFFSET}, "fixup4.dat") }
     on-resource kernel8.img { fat_write(${BOOT_A_PART_OFFSET}, "kernel8.img") }
     on-resource bcm2712-rpi-5-b.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-5-b.dtb") }
+    on-resource bcm2712-rpi-cm5l-cm4io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5l-cm4io.dtb") }
+    on-resource bcm2712-rpi-cm5l-cm5io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5l-cm5io.dtb") }
     on-resource overlay_map.dtb { fat_write(${BOOT_A_PART_OFFSET}, "overlays/overlay_map.dtb") }
     on-resource rpi-ft5406.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-ft5406.dtbo") }
     on-resource rpi-backlight.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-backlight.dtbo") }
@@ -263,6 +271,8 @@ task upgrade.a {
     on-resource fixup4.dat { fat_write(${BOOT_A_PART_OFFSET}, "fixup4.dat") }
     on-resource kernel8.img { fat_write(${BOOT_A_PART_OFFSET}, "kernel8.img") }
     on-resource bcm2712-rpi-5-b.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-5-b.dtb") }
+    on-resource bcm2712-rpi-cm5l-cm4io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5l-cm4io.dtb") }
+    on-resource bcm2712-rpi-cm5l-cm5io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5l-cm5io.dtb") }
     on-resource overlay_map.dtb { fat_write(${BOOT_A_PART_OFFSET}, "overlays/overlay_map.dtb") }
     on-resource rpi-ft5406.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-ft5406.dtbo") }
     on-resource rpi-backlight.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-backlight.dtbo") }
@@ -355,6 +365,8 @@ task upgrade.b {
     on-resource fixup4.dat { fat_write(${BOOT_B_PART_OFFSET}, "fixup4.dat") }
     on-resource kernel8.img { fat_write(${BOOT_B_PART_OFFSET}, "kernel8.img") }
     on-resource bcm2712-rpi-5-b.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2712-rpi-5-b.dtb") }
+    on-resource bcm2712-rpi-cm5l-cm4io.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2712-rpi-cm5l-cm4io.dtb") }
+    on-resource bcm2712-rpi-cm5l-cm5io.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2712-rpi-cm5l-cm5io.dtb") }
     on-resource overlay_map.dtb { fat_write(${BOOT_B_PART_OFFSET}, "overlays/overlay_map.dtb") }
     on-resource rpi-ft5406.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/rpi-ft5406.dtbo") }
     on-resource rpi-backlight.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/rpi-backlight.dtbo") }

diff --git a/nerves_defconfig b/nerves_defconfig
@@ -34,7 +34,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/linux-6.6.defconfig"
 BR2_LINUX_KERNEL_XZ=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b broadcom/bcm2712-rpi-cm5l-cm4io broadcom/bcm2712-rpi-cm5l-cm5io"
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="${NERVES_DEFCONFIG_DIR}/ramoops.dts"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/busybox.config"