Add support for CM5 and RPi500

At this moment the RPi5 image does not build properly, and CM5
and RPi500 are not supported at all.

This patch does several things:
* Bumps kernel to 6.6 on the Pi5 image
* Bumps the balena bootloader kernel to 6.6
* Adds CM5 and RPi500 device trees to the RPi5 image

It was necessary to backport the 6.6 recipe from meta-raspberrypi,
as 6.6 is only available from scarthgap up, and balena-raspberrypi
is still on kirkstone.

RPi5, RPi500 and CM5 are therefore supported by a single device type.

Change-type: minor
Changelog-entry: Add support for CM5 and RPi500
Signed-off-by: Michal Toman <michalt@balena.io>

Author: mtoman

layers/meta-balena-raspberrypi/conf/layer.conf

@@ -24,6 +24,13 @@ KERNEL_DEVICETREE:append:npe-x500-m3 = " overlays/npe-x500-m3.dtbo"
 # for updating boot EEPROM on RPI4
 KERNEL_DEVICETREE:append:raspberrypi4-64 = " overlays/spi-gpio40-45.dtbo"
 
+RPI_KERNEL_DEVICETREE:append:raspberrypi5 = " broadcom/bcm2712d0-rpi-5-b.dtb"
+RPI_KERNEL_DEVICETREE:append:raspberrypi5 = " broadcom/bcm2712-rpi-500.dtb"
+RPI_KERNEL_DEVICETREE:append:raspberrypi5 = " broadcom/bcm2712-rpi-cm5-cm4io.dtb"
+RPI_KERNEL_DEVICETREE:append:raspberrypi5 = " broadcom/bcm2712-rpi-cm5-cm5io.dtb"
+RPI_KERNEL_DEVICETREE:append:raspberrypi5 = " broadcom/bcm2712-rpi-cm5l-cm4io.dtb"
+RPI_KERNEL_DEVICETREE:append:raspberrypi5 = " broadcom/bcm2712-rpi-cm5l-cm5io.dtb"
+
 # we do not add the following overlays for the linux-kunbus kernel
 KERNEL_DEVICETREE:remove:revpi = "overlays/ds2482.dtbo"
 KERNEL_DEVICETREE:remove:revpi = "overlays/neuron-spi-new.dtbo"
@@ -138,6 +145,9 @@ RPI_KERNEL_DEVICETREE:remove:revpi-connect = "bcm2711-rpi-cm4s.dtb"
 RPI_KERNEL_DEVICETREE:remove:revpi-core-3 = "bcm2711-rpi-cm4s.dtb"
 
 PREFERRED_VERSION:linux-raspberrypi = "5.10.%"
+PREFERRED_VERSION_linux-raspberrypi:raspberrypi5 = "6.6%"
+
+KBUILD_DEFCONFIG:raspberrypi5 = "bcm2712_defconfig"
 
 FIRMWARE_COMPRESSION:raspberrypi4-64 ?= "1"
 FIRMWARE_COMPRESSION:raspberrypi0-2w-64 ?= "1"

layers/meta-balena-raspberrypi/recipes-core/images/balena-image.inc

@@ -11,6 +11,10 @@ SDIMG_KERNELIMAGE:raspberrypi2 ?= "kernel7.img"
 SDIMG_KERNELIMAGE:raspberrypi3-64 ?= "kernel8.img"
 SDIMG_KERNELIMAGE:raspberrypi0-2w-64 ?= "kernel8.img"
 
+# We want to stick with kernel8.img for the Pi5,
+# even though upstream uses kernel_2712.img
+SDIMG_KERNELIMAGE:raspberrypi5 ?= "kernel8.img"
+
 # Double the root partition size from 320MiB to 640MiB and boot partition size from 40MiB to 80MiB for the Pi5
 IMAGE_ROOTFS_SIZE:raspberrypi5="655360"
 BALENA_BOOT_SIZE:raspberrypi5="81920"

layers/meta-balena-raspberrypi/recipes-kernel/linux/linux-balena-bootloader_6.1.bb renamed to layers/meta-balena-raspberrypi/recipes-kernel/linux/linux-balena-bootloader_6.6.bb

@@ -1,9 +1,9 @@
-LINUX_VERSION ?= "6.1.64"
-LINUX_RPI_BRANCH ?= "rpi-6.1.y"
-LINUX_RPI_KMETA_BRANCH ?= "yocto-6.1"
+LINUX_VERSION ?= "6.6.63"
+LINUX_RPI_BRANCH ?= "rpi-6.6.y"
+LINUX_RPI_KMETA_BRANCH ?= "yocto-6.6"
 
-SRCREV_machine = "dad5d57939cfae7af363e7c9862b59d33d96794b"
-SRCREV_meta = "f845a7f37d7114230d6609e2bd630070f2f6cd9b"
+SRCREV_machine = "e442e5c1ab6bff5b5460b4fc949beb72aaf77970"
+SRCREV_meta = "52ff0d75713ce61962b325a2090bd55e216f0cf3"
 
 KMETA = "kernel-meta"
 

layers/meta-balena-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.6.bb

@@ -0,0 +1,33 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/../../../meta-raspberrypi/recipes-kernel/linux/files:"
+
+LINUX_VERSION ?= "6.6.63"
+LINUX_RPI_BRANCH ?= "rpi-6.6.y"
+LINUX_RPI_KMETA_BRANCH ?= "yocto-6.6"
+
+SRCREV_machine = "e442e5c1ab6bff5b5460b4fc949beb72aaf77970"
+SRCREV_meta = "52ff0d75713ce61962b325a2090bd55e216f0cf3"
+
+KMETA = "kernel-meta"
+
+SRC_URI = " \
+    git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH};protocol=https \
+    git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \
+    file://powersave.cfg \
+    file://android-drivers.cfg \
+    "
+
+require recipes-kernel/linux/linux-raspberrypi.inc
+
+KERNEL_DTC_FLAGS += "-@ -H epapr"
+
+RDEPENDS:${KERNEL_PACKAGE_NAME}:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-base"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-image:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-image"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-dev:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dev"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-vmlinux:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-vmlinux"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-modules:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-modules"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-dbg:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dbg"
+
+DEPLOYDEP = ""
+DEPLOYDEP:raspberrypi-armv7 = "${RASPBERRYPI_v7_KERNEL}:do_deploy"
+do_deploy[depends] += "${DEPLOYDEP}"