Skip to content

Commit bec066a

Browse files
committed
Add CM5 device tree files
This is untested, but should make it more likely for CM5's to work when people start getting them.
1 parent 5a8d937 commit bec066a

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

fwup.conf

+12
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ file-resource kernel8.img {
2525
file-resource bcm2712-rpi-5-b.dtb {
2626
host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-5-b.dtb"
2727
}
28+
file-resource bcm2712-rpi-cm5l-cm4io.dtb {
29+
host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5l-cm4io.dtb"
30+
}
31+
file-resource bcm2712-rpi-cm5l-cm5io.dtb {
32+
host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5l-cm5io.dtb"
33+
}
2834
file-resource overlay_map.dtb {
2935
host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/overlay_map.dtb"
3036
}
@@ -179,6 +185,8 @@ task complete {
179185
on-resource fixup4.dat { fat_write(${BOOT_A_PART_OFFSET}, "fixup4.dat") }
180186
on-resource kernel8.img { fat_write(${BOOT_A_PART_OFFSET}, "kernel8.img") }
181187
on-resource bcm2712-rpi-5-b.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-5-b.dtb") }
188+
on-resource bcm2712-rpi-cm5l-cm4io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5l-cm4io.dtb") }
189+
on-resource bcm2712-rpi-cm5l-cm5io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5l-cm5io.dtb") }
182190
on-resource overlay_map.dtb { fat_write(${BOOT_A_PART_OFFSET}, "overlays/overlay_map.dtb") }
183191
on-resource rpi-ft5406.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-ft5406.dtbo") }
184192
on-resource rpi-backlight.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-backlight.dtbo") }
@@ -263,6 +271,8 @@ task upgrade.a {
263271
on-resource fixup4.dat { fat_write(${BOOT_A_PART_OFFSET}, "fixup4.dat") }
264272
on-resource kernel8.img { fat_write(${BOOT_A_PART_OFFSET}, "kernel8.img") }
265273
on-resource bcm2712-rpi-5-b.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-5-b.dtb") }
274+
on-resource bcm2712-rpi-cm5l-cm4io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5l-cm4io.dtb") }
275+
on-resource bcm2712-rpi-cm5l-cm5io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5l-cm5io.dtb") }
266276
on-resource overlay_map.dtb { fat_write(${BOOT_A_PART_OFFSET}, "overlays/overlay_map.dtb") }
267277
on-resource rpi-ft5406.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-ft5406.dtbo") }
268278
on-resource rpi-backlight.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-backlight.dtbo") }
@@ -355,6 +365,8 @@ task upgrade.b {
355365
on-resource fixup4.dat { fat_write(${BOOT_B_PART_OFFSET}, "fixup4.dat") }
356366
on-resource kernel8.img { fat_write(${BOOT_B_PART_OFFSET}, "kernel8.img") }
357367
on-resource bcm2712-rpi-5-b.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2712-rpi-5-b.dtb") }
368+
on-resource bcm2712-rpi-cm5l-cm4io.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2712-rpi-cm5l-cm4io.dtb") }
369+
on-resource bcm2712-rpi-cm5l-cm5io.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2712-rpi-cm5l-cm5io.dtb") }
358370
on-resource overlay_map.dtb { fat_write(${BOOT_B_PART_OFFSET}, "overlays/overlay_map.dtb") }
359371
on-resource rpi-ft5406.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/rpi-ft5406.dtbo") }
360372
on-resource rpi-backlight.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/rpi-backlight.dtbo") }

nerves_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3434
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/linux-6.6.defconfig"
3535
BR2_LINUX_KERNEL_XZ=y
3636
BR2_LINUX_KERNEL_DTS_SUPPORT=y
37-
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b"
37+
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b broadcom/bcm2712-rpi-cm5l-cm4io broadcom/bcm2712-rpi-cm5l-cm5io"
3838
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="${NERVES_DEFCONFIG_DIR}/ramoops.dts"
3939
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
4040
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/busybox.config"

0 commit comments

Comments
 (0)