Skip to content

Commit 37a49e9

Browse files
committed
Bump Linux to 6.6.64; add new cm5 device tree files
1 parent 70407c9 commit 37a49e9

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
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-cm5-cm4io.dtb {
29+
host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5-cm4io.dtb"
30+
}
31+
file-resource bcm2712-rpi-cm5-cm5io.dtb {
32+
host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5-cm5io.dtb"
33+
}
2834
file-resource bcm2712-rpi-cm5l-cm4io.dtb {
2935
host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5l-cm4io.dtb"
3036
}
@@ -185,6 +191,8 @@ task complete {
185191
on-resource fixup4.dat { fat_write(${BOOT_A_PART_OFFSET}, "fixup4.dat") }
186192
on-resource kernel8.img { fat_write(${BOOT_A_PART_OFFSET}, "kernel8.img") }
187193
on-resource bcm2712-rpi-5-b.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-5-b.dtb") }
194+
on-resource bcm2712-rpi-cm5-cm4io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5-cm4io.dtb") }
195+
on-resource bcm2712-rpi-cm5-cm5io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5-cm5io.dtb") }
188196
on-resource bcm2712-rpi-cm5l-cm4io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5l-cm4io.dtb") }
189197
on-resource bcm2712-rpi-cm5l-cm5io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5l-cm5io.dtb") }
190198
on-resource overlay_map.dtb { fat_write(${BOOT_A_PART_OFFSET}, "overlays/overlay_map.dtb") }
@@ -271,6 +279,8 @@ task upgrade.a {
271279
on-resource fixup4.dat { fat_write(${BOOT_A_PART_OFFSET}, "fixup4.dat") }
272280
on-resource kernel8.img { fat_write(${BOOT_A_PART_OFFSET}, "kernel8.img") }
273281
on-resource bcm2712-rpi-5-b.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-5-b.dtb") }
282+
on-resource bcm2712-rpi-cm5-cm4io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5-cm4io.dtb") }
283+
on-resource bcm2712-rpi-cm5-cm5io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5-cm5io.dtb") }
274284
on-resource bcm2712-rpi-cm5l-cm4io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5l-cm4io.dtb") }
275285
on-resource bcm2712-rpi-cm5l-cm5io.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2712-rpi-cm5l-cm5io.dtb") }
276286
on-resource overlay_map.dtb { fat_write(${BOOT_A_PART_OFFSET}, "overlays/overlay_map.dtb") }
@@ -365,6 +375,8 @@ task upgrade.b {
365375
on-resource fixup4.dat { fat_write(${BOOT_B_PART_OFFSET}, "fixup4.dat") }
366376
on-resource kernel8.img { fat_write(${BOOT_B_PART_OFFSET}, "kernel8.img") }
367377
on-resource bcm2712-rpi-5-b.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2712-rpi-5-b.dtb") }
378+
on-resource bcm2712-rpi-cm5-cm4io.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2712-rpi-cm5-cm4io.dtb") }
379+
on-resource bcm2712-rpi-cm5-cm5io.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2712-rpi-cm5-cm5io.dtb") }
368380
on-resource bcm2712-rpi-cm5l-cm4io.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2712-rpi-cm5l-cm4io.dtb") }
369381
on-resource bcm2712-rpi-cm5l-cm5io.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2712-rpi-cm5l-cm5io.dtb") }
370382
on-resource overlay_map.dtb { fat_write(${BOOT_B_PART_OFFSET}, "overlays/overlay_map.dtb") }

nerves_defconfig

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-build.sh ${BR2_EXTERN
2828
BR2_ROOTFS_POST_IMAGE_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-createfs.sh"
2929
BR2_LINUX_KERNEL=y
3030
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
31-
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/refs/tags/stable_20241008.tar.gz"
32-
BR2_LINUX_KERNEL_PATCH="http://cdn.kernel.org/pub/linux/kernel/projects/rt/6.6/patch-6.6.53-rt44.patch.gz ${NERVES_DEFCONFIG_DIR}/linux"
31+
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/80533a952218696c0ef1b346bab50dc401e6b74c.tar.gz"
32+
BR2_LINUX_KERNEL_PATCH="http://cdn.kernel.org/pub/linux/kernel/projects/rt/6.6/patch-6.6.65-rt47.patch.gz ${NERVES_DEFCONFIG_DIR}/linux"
3333
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 broadcom/bcm2712-rpi-cm5l-cm4io broadcom/bcm2712-rpi-cm5l-cm5io"
37+
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b broadcom/bcm2712-rpi-cm5l-cm4io broadcom/bcm2712-rpi-cm5l-cm5io broadcom/bcm2712-rpi-cm5-cm4io broadcom/bcm2712-rpi-cm5-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"
@@ -48,7 +48,7 @@ BR2_PACKAGE_MESA3D=y
4848
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
4949
BR2_PACKAGE_MESA3D_OPENGL_ES=y
5050
BR2_PACKAGE_RPI_FIRMWARE=y
51-
BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20241008"
51+
BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="38d3dfafad92577c9e295fa3b7e5ec29adde94c5"
5252
BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X=y
5353
# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set
5454
# BR2_PACKAGE_ALSA_LIB_RAWMIDI is not set

0 commit comments

Comments
 (0)