Don't add pi5 to config.txt

The firmware we use for most images has no idea what the pi5 is, and
this breaks arm64 booting of the < pi5.  So we do it as a quick hack in
the pi5 script to add it in.

common.d/rpi_firmware.sh

@@ -32,8 +32,6 @@ kernel=kernel8-alt.img
 #max_framebuffers=2
 # 64-bit kernel for Raspberry Pi 4 is called kernel8l (armv8a)
 kernel=kernel8l-alt.img
-[pi5]
-kernel=kernel8.img
 [all]
 #dtoverlay=vc4-fkms-v3d
 # Tell firmware to go 64-bit mode

raspberry-pi5.sh

@@ -132,6 +132,10 @@ make_fstab
 
 # Configure Raspberry Pi firmware (before rsync)
 include rpi_firmware
+# We need to add in a directive so that the Pi5 knows which kernel to use.
+sed -i -e '79 i [pi5]' "${work_dir}"/boot/config.txt
+sed -i -e '80 i kernel=kernel8.img' "${work_dir}"/boot/config.txt
+
 
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"