RW

Author: alexgg

layers/meta-balena-raspberrypi/recipes-kernel/linux/files/balena-os-drivers.cfg

@@ -35,7 +35,6 @@ CONFIG_FB_TFT_TINYLCD=m
 CONFIG_FB_TFT_TLS8204=m
 CONFIG_FB_TFT_UC1701=m
 CONFIG_FB_TFT_UPD161704=m
-CONFIG_FB_TFT_WATTEROTT=m
 
 # pca955 GPIO expander
 CONFIG_GPIO_PCA953X=y
@@ -62,7 +61,8 @@ CONFIG_HAS_DMA=y
 CONFIG_CAN_MCP251X=m
 
 # CAN bit timing
-CONFIG_CAN_DEV=y
+# CAN_DEV lives under "if CAN" and CONFIG_CAN is modular, so it can only be =m.
+CONFIG_CAN_DEV=m
 CONFIG_CAN_CALC_BITTIMING=y
 
 # DS1307 RTC

layers/meta-balena-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend

@@ -45,11 +45,6 @@ do_deploy[prefuncs] += "do_overlays"
 # the boot partition can be generated correctly
 do_install[nostamp] = "1"
 
-# Built-in SPI drivers needed for API EEPROM update
-# Otherwise on A/B rollback modules won't match running kernel
-BALENA_CONFIGS:append:raspberrypi4-64 = " pieeprom"
-BALENA_CONFIGS[pieeprom] = " \
-    CONFIG_SPI=y \
-    CONFIG_SPI_BCM2835=y \
-    CONFIG_SPI_SPIDEV=y \
-"
+# Built-in SPI drivers for the raspberrypi4-64 EEPROM update / A-B rollback
+# path. Shared with the override extension kernel via a common include.
+require recipes-kernel/linux/pieeprom.inc

layers/meta-balena-raspberrypi/recipes-kernel/linux/pieeprom.inc

@@ -0,0 +1,12 @@
+# Built-in SPI drivers needed for API EEPROM update
+# Otherwise on A/B rollback modules won't match running kernel
+#
+# Shared by the base kernel (linux-raspberrypi_%.bbappend) and the override
+# extension kernel (linux-raspberrypi-extension) so both stay in sync on
+# raspberrypi4-64. Injected via BALENA_CONFIGS (do_kernel_resin_injectconfig).
+BALENA_CONFIGS:append:raspberrypi4-64 = " pieeprom"
+BALENA_CONFIGS[pieeprom] = " \
+    CONFIG_SPI=y \
+    CONFIG_SPI_BCM2835=y \
+    CONFIG_SPI_SPIDEV=y \
+"

layers/meta-kernel-block/recipes-kernel/linux/linux-raspberrypi-extension_6.12.bb

@@ -29,15 +29,18 @@ PROVIDES = "virtual/kernel-extension"
 
 inherit kernel-balena-override
 
-# When modules are compressed, OR standard strip will not strip debug symbols.
-# Usually balenaOS does not set CONFIG_DEBUG_INFO=y, but this extension does
-# so we need to make sure debug symbols are stripped, while keeping the BTF
-# data that survives the strip debug.
-do_install:prepend() {
-    if grep -q '^CONFIG_MODULE_COMPRESS=y$' "${B}/.config"; then
-        export INSTALL_MOD_STRIP=1
-    fi
-}
+# Driver set first (shared with the base OS kernel), extension deltas last so
+# they win. Resolved on FILESPATH, never via SRC_URI (that would merge early).
+KERNEL_BALENA_OVERRIDE_FRAGMENTS = "balena-os-drivers.cfg bpf-lsm-debug.cfg"
+
+# raspberrypi4-64 EEPROM/A-B rollback SPI drivers. Shared with the base kernel
+# via BALENA_CONFIGS[pieeprom] (early inject), so both stay in sync.
+require recipes-kernel/linux/pieeprom.inc
+
+# bpf-lsm-debug.cfg enables CONFIG_DEBUG_INFO_BTF, which kconfig gates on
+# PAHOLE_VERSION >= 121. Without pahole in the build, BTF is silently dropped
+# (and do_kernel_balena_verify_fragments then fails, as intended).
+DEPENDS += "pahole-native"
 
 # When modules are compressed, OR standard strip will not strip debug symbols.
 # Usually balenaOS does not set CONFIG_DEBUG_INFO=y, but this extension does
@@ -48,16 +51,3 @@ do_install:prepend() {
         export INSTALL_MOD_STRIP=1
     fi
 }
-
-# Track local fragments in the task hash; kernel-balena's
-# do_kernel_balena_merge_fragments does the actual *.cfg merge.
-python () {
-    import glob
-    import os
-    thisdir = d.getVar("THISDIR")
-    fragments = sorted(glob.glob(os.path.join(thisdir, "files", "*.cfg")))
-    d.appendVarFlag(
-        "do_kernel_balena_merge_fragments", "file-checksums",
-        " " + " ".join(f"{p}:True" for p in fragments),
-    )
-}