RPI5/CM5: add EEPROM programming support

.github/workflows/raspberrypicm4-ioboard-sb.yml

@@ -83,7 +83,9 @@ jobs:
     if: (github.event.pull_request.head.repo.full_name == github.repository) == (github.event_name == 'pull_request')
     secrets: inherit
     with:
-      machine: raspberrypicm4-ioboard-sb
+      machine: raspberrypicm4-ioboard
+      slug: raspberrypicm4-ioboard-sb
+      build-args: '--templates-path layers/meta-balena-rpi-sb/conf/samples/raspberrypicm4-ioboard-sb'
       # Hardcode the device repo in case this workflow is called by another workflow
       device-repo: balena-os/balena-raspberrypi
       device-repo-ref: ${{ inputs.device-repo-ref || github.ref }}

.gitmodules

@@ -30,3 +30,7 @@
 	path = layers/meta-cyclonedx
 	url = https://github.com/balena-os/meta-cyclonedx
 	branch = kirkstone
+[submodule "layers/meta-balena-rpi-sb"]
+	path = layers/meta-balena-rpi-sb
+	url = https://github.com/balena-os/meta-balena-rpi-sb.git
+	branch = master

layers/meta-balena-raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend

@@ -46,14 +46,31 @@ do_deploy:append() {
     rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/start4db.elf
 
     if echo ${MACHINEOVERRIDES} | grep -i "raspberrypi4-64"; then
-        # exclude from raspberrypi4-64 based balenaOS builds the binaries which are for previous RaspberryPi versions
+        # exclude the binaries which are for previous RaspberryPi versions
         rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/fixup.dat
         rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/fixup_cd.dat
         rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/fixup_x.dat
         rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/start.elf
         rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/start_cd.elf
         rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/start_x.elf
-        # bootcode.bin is not used anymore on rpi4 as the boot code is now in an EEPROM (https://www.raspberrypi.org/documentation/hardware/raspberrypi/booteeprom.md)
+        # bootcode.bin is not used anymore on rpi4i/rpi5 as the boot code is now in an EEPROM (https://www.raspberrypi.org/documentation/hardware/raspberrypi/booteeprom.md)
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/bootcode.bin
+    elif echo ${MACHINEOVERRIDES} | grep -i "raspberrypi5"; then
+        # exclude the binaries which are for previous RaspberryPi versions
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/fixup.dat
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/fixup_cd.dat
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/fixup_x.dat
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/start.elf
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/start_cd.elf
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/start_x.elf
+        # exclude RaspberryPi4 specific firmware from non raspberrypi4-64 based balenaOS builds
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/fixup4.dat
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/fixup4cd.dat
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/fixup4x.dat
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/start4.elf
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/start4cd.elf
+        rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/start4x.elf
+        # bootcode.bin is not used anymore on rpi4i/rpi5 as the boot code is now in an EEPROM (https://www.raspberrypi.org/documentation/hardware/raspberrypi/booteeprom.md)
         rm -f ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/bootcode.bin
     else
         # exclude RaspberryPi4 specific firmware from non raspberrypi4-64 based balenaOS builds

layers/meta-balena-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bbappend

@@ -1,19 +1,14 @@
 # Set console accordingly to build type
 CMDLINE += " dwc_otg.lpm_enable=0 rootwait"
-CMDLINE += "${OS_KERNEL_CMDLINE} ${@oe.utils.conditional('SIGN_API','','',"${OS_KERNEL_SECUREBOOT_CMDLINE}",d)}"
 
 # Add earlycon with OS_DEVELOPMENT=1
 CMDLINE:prepend:raspberrypi4-64 = " ${@bb.utils.contains('DISTRO_FEATURES','osdev-image',"earlycon=uart8250,mmio32,0xfe215040 console=tty1","",d)}"
 CMDLINE:prepend:raspberrypi400-64 = " ${@bb.utils.contains('DISTRO_FEATURES','osdev-image',"earlycon=uart8250,mmio32,0xfe215040 console=tty1","",d)}"
 CMDLINE:prepend:raspberrypicm4-ioboard = " ${@bb.utils.contains('DISTRO_FEATURES','osdev-image',"earlycon=uart8250,mmio32,0xfe215040 console=tty1","",d)}"
-CMDLINE:prepend:raspberrypicm4-ioboard-sb = " ${@bb.utils.contains('DISTRO_FEATURES','osdev-image',"earlycon=uart8250,mmio32,0xfe215040 console=tty1","",d)}"
 
 # See https://github.com/raspberrypi/linux/commit/9b0efcc1ec497b2985c6aaa60cd97f0d2d96d203
 CMDLINE += " cgroup_enable=memory"
 CMDLINE:remove = "root=/dev/mmcblk0p2"
 CMDLINE_DEBUG = ""
 
-# Necessary for balena bootloader to work
-# These will not be passed to the actual kernel
-CMDLINE:append:raspberrypicm4-ioboard-sb := " balena_stage2 nr_cpus=1"
 CMDLINE:append:raspberrypi5 := " balena_stage2 maxcpus=0"

layers/meta-balena-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend

@@ -9,6 +9,9 @@ do_deploy:append() {
     if ! ${@bb.utils.contains('DISTRO_FEATURES','osdev-image','true','false',d)}; then
         echo "avoid_warnings=1" >>${DEPLOYDIR}/bootfiles/config.txt
     fi
+}
+
+do_deploy:append:raspberrypi4-64() {
     # Enable audio (loads snd_bcm2835)
     echo "dtparam=audio=on" >> ${DEPLOYDIR}/bootfiles/config.txt
 }
@@ -43,12 +46,6 @@ do_deploy:append:revpi-connect-4() {
 	echo "dtparam=ant2" >> ${DEPLOYDIR}/bootfiles/config.txt
 }
 
-do_deploy:append:raspberrypicm4-ioboard-sb() {
-    echo "dtoverlay=dwc2,dr_mode=host" >> ${DEPLOYDIR}/bootfiles/config.txt
-    # Remap audio pins to free GPIOs 40/41 for SPI0 EEPROM programming
-    echo "dtoverlay=audremap" >> ${DEPLOYDIR}/bootfiles/config.txt
-}
-
 do_deploy:append:raspberrypi3-unipi-neuron() {
 	# Use the dt overlays required by the UniPi Neuron family of boards
 	echo "dtoverlay=neuronee" >> ${DEPLOYDIR}/bootfiles/config.txt