Switch to new kernel and firmware packages

stage1/00-boot-files/00-run.sh

@@ -1,4 +1,17 @@
 #!/bin/bash -e
 
-install -m 644 files/cmdline.txt "${ROOTFS_DIR}/boot/"
-install -m 644 files/config.txt "${ROOTFS_DIR}/boot/"
+mkdir -p "${ROOTFS_DIR}/boot/firmware"
+
+if ! [ -L "${ROOTFS_DIR}/boot/overlays" ]; then
+	ln -s firmware/overlays "${ROOTFS_DIR}/boot/overlays"
+fi
+
+install -m 644 files/cmdline.txt "${ROOTFS_DIR}/boot/firmware/"
+if ! [ -L "${ROOTFS_DIR}/boot/cmdline.txt" ]; then
+	ln -s firmware/cmdline.txt "${ROOTFS_DIR}/boot/cmdline.txt"
+fi
+
+install -m 644 files/config.txt "${ROOTFS_DIR}/boot/firmware/"
+if ! [ -L "${ROOTFS_DIR}/boot/config.txt" ]; then
+	ln -s firmware/config.txt "${ROOTFS_DIR}/boot/config.txt"
+fi

stage1/00-boot-files/files/config.txt

@@ -1,70 +1,41 @@
 # For more options and information see
-# http://rpf.io/configtxt
+# http://rptl.io/configtxt
 # Some settings may impact device functionality. See link above for details
 
-# uncomment if you get no picture on HDMI for a default "safe" mode
-#hdmi_safe=1
-
-# uncomment the following to adjust overscan. Use positive numbers if console
-# goes off screen, and negative if there is too much border
-#overscan_left=16
-#overscan_right=16
-#overscan_top=16
-#overscan_bottom=16
-
-# uncomment to force a console size. By default it will be display's size minus
-# overscan.
-#framebuffer_width=1280
-#framebuffer_height=720
-
-# uncomment if hdmi display is not detected and composite is being output
-#hdmi_force_hotplug=1
-
-# uncomment to force a specific HDMI mode (this will force VGA)
-#hdmi_group=1
-#hdmi_mode=1
-
-# uncomment to force a HDMI mode rather than DVI. This can make audio work in
-# DMT (computer monitor) modes
-#hdmi_drive=2
-
-# uncomment to increase signal to HDMI, if you have interference, blanking, or
-# no display
-#config_hdmi_boost=4
-
-# uncomment for composite PAL
-#sdtv_mode=2
-
-#uncomment to overclock the arm. 700 MHz is the default.
-#arm_freq=800
-
 # Uncomment some or all of these to enable the optional hardware interfaces
 #dtparam=i2c_arm=on
 #dtparam=i2s=on
 #dtparam=spi=on
 
-# Uncomment this to enable infrared communication.
-#dtoverlay=gpio-ir,gpio_pin=17
-#dtoverlay=gpio-ir-tx,gpio_pin=18
-
-# Additional overlays and parameters are documented /boot/overlays/README
-
 # Enable audio (loads snd_bcm2835)
 dtparam=audio=on
 
+# Additional overlays and parameters are documented
+# /boot/firmware/overlays/README
+
 # Automatically load overlays for detected cameras
 camera_auto_detect=1
 
 # Automatically load overlays for detected DSI displays
 display_auto_detect=1
 
+# Automatically load initramfs files, if found
+auto_initramfs=1
+
 # Enable DRM VC4 V3D driver
 dtoverlay=vc4-kms-v3d
 max_framebuffers=2
 
+# Don't have the firmware create an initial video= setting in cmdline.txt.
+# Use the kernel's default instead.
+disable_fw_kms_setup=1
+
 # Disable compensation for displays with overscan
 disable_overscan=1
 
+# Run as fast as firmware / board allows
+arm_boost=1
+
 [cm4]
 # Enable host mode on the 2711 built-in XHCI USB controller.
 # This line should be removed if the legacy DWC2 controller is required
@@ -73,8 +44,3 @@ otg_mode=1
 
 [all]
 
-[pi4]
-# Run as fast as firmware / board allows
-arm_boost=1
-
-[all]

stage1/01-sys-tweaks/files/fstab

@@ -1,3 +1,3 @@
 proc            /proc           proc    defaults          0       0
-BOOTDEV  /boot           vfat    defaults          0       2
+BOOTDEV  /boot/firmware  vfat    defaults          0       2
 ROOTDEV  /               ext4    defaults,noatime  0       1