Fix duplicate boot.kernelModules, merge vc4/panel_cwu50 into existing list

This commit is contained in:
2026-06-09 22:20:27 -04:00
parent 288b7538d5
commit f57f2846ff

View File

@@ -181,17 +181,17 @@ in
"rtl8xxxu" # RTL8188/8192/8723 USB WiFi
"rtl2832_sdr" # RTL-SDR kernel module
"dvb_usb_rtl28xxu" # RTL-SDR DVB-T
# CRITICAL: Load vc4 + panel_cwu50 AFTER RP1 PCIe init (~12s)
# Don't put them in initrd — RP1 southbridge isn't ready yet
"panel_cwu50" # uConsole display panel driver
"vc4" # VideoCore 4 KMS GPU driver
];
boot.blacklistedKernelModules = [ ];
# CRITICAL: Delay vc4 + panel_cwu50 loading to after RP1 PCIe init
# On CM5, RP1 southbridge takes ~12s to initialize. Loading display
# drivers in initrd (~3s) causes "Cannot find any crtc" because the
# DSI encoder isn't reachable yet. Rex loads them later via udev.
# Keep ocp8178_bl in initrd (backlight is independent of RP1).
# Override nixos-uconsole initrd: don't load vc4/panel_cwu50 early
# (RP1 PCIe isn't ready yet — causes CRTC error)
boot.initrd.kernelModules = lib.mkForce [ "ocp8178_bl" ];
boot.kernelModules = lib.mkBefore [ "vc4" "panel_cwu50" ];
# ============================================================
# Extra udev rules for SDR and HAM radio devices