diff --git a/pkgs/additional/linux-sane-pinephonepro/default.nix b/pkgs/additional/linux-sane-pinephonepro/default.nix index 84068dc1b..89165c437 100644 --- a/pkgs/additional/linux-sane-pinephonepro/default.nix +++ b/pkgs/additional/linux-sane-pinephonepro/default.nix @@ -142,27 +142,11 @@ linux_latest.override { POWERCAP = lib.mkForce no; CPUMASK_OFFSTACK = no; KFENCE = lib.mkForce no; - HARDLOCKUP_DETECTOR = lib.mkForce no; HID_BPF = lib.mkForce no; - USB_SERIAL = lib.mkForce module; - U_SERIAL_CONSOLE = lib.mkForce no; - WATCH_QUEUE = lib.mkForce no; - SCHED_CORE = lib.mkForce no; - BPF_JIT_ALWAYS_ON = lib.mkForce yes; - PARAVIRT_TIME_ACCOUNTING = lib.mkForce no; - ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION = yes; #< does not take effect - COMPAT_ALIGNMENT_FIXUPS = lib.mkForce no; BLK_INLINE_ENCRYPTION = lib.mkForce no; - IDLE_PAGE_TRACKING = lib.mkForce no; - PAGE_IDLE_FLAG = no; - FSL_MC_UAPI_SUPPORT = lib.mkForce no; - ZRAM_MULTI_COMP = lib.mkForce no; - NET_FC = lib.mkForce no; - NET_VENDOR_MEDIATEK = lib.mkForce no; ATH10K_DFS_CERTIFIED = lib.mkForce no; - WAN = lib.mkForce no; MOUSE_ELAN_I2C_SMBUS = lib.mkForce no; PINCTRL_AMD = lib.mkForce no; AUXDISPLAY = lib.mkForce no; @@ -170,7 +154,6 @@ linux_latest.override { DRM_DISPLAY_DP_AUX_CHARDEV = lib.mkForce no; DRM_NOUVEAU_GSP_DEFAULT = lib.mkForce no; DRM_VC4_HDMI_CEC = lib.mkForce no; - EFI_ZBOOT = lib.mkForce no; NO_HZ_IDLE = yes; NO_HZ_FULL = lib.mkForce no; @@ -192,19 +175,39 @@ linux_latest.override { RUNTIME_TESTING_MENU = lib.mkForce yes; + # TODO: one of these is required for boot? + USB_SERIAL = lib.mkForce module; + FSL_MC_UAPI_SUPPORT = lib.mkForce no; + NET_FC = lib.mkForce no; + NET_VENDOR_MEDIATEK = lib.mkForce no; + WAN = lib.mkForce no; + # or maybe one of these? + HARDLOCKUP_DETECTOR = lib.mkForce no; + U_SERIAL_CONSOLE = lib.mkForce no; + WATCH_QUEUE = lib.mkForce no; + SCHED_CORE = lib.mkForce no; + BPF_JIT_ALWAYS_ON = lib.mkForce yes; + PARAVIRT_TIME_ACCOUNTING = lib.mkForce no; + ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION = yes; #< does not take effect + COMPAT_ALIGNMENT_FIXUPS = lib.mkForce no; + IDLE_PAGE_TRACKING = lib.mkForce no; + PAGE_IDLE_FLAG = no; + EFI_ZBOOT = lib.mkForce no; + ZRAM_MULTI_COMP = lib.mkForce no; + # upgrade `m` -> `y` - INPUT_MATRIXKMAP = lib.mkForce yes; - I2C_CROS_EC_TUNNEL = yes; - CHARGER_CROS_PCHG = yes; - CHARGER_CROS_CONTROL = yes; - SENSORS_CROS_EC = yes; - MFD_CROS_EC_DEV = yes; - REGULATOR_CROS_EC = yes; - RTC_DRV_CROS_EC = yes; - CROS_EC = lib.mkForce yes; - CROS_EC_I2C = lib.mkForce yes; - CROS_EC_SPI = lib.mkForce yes; - EXTCON_USBC_CROS_EC = yes; + # INPUT_MATRIXKMAP = lib.mkForce yes; + # I2C_CROS_EC_TUNNEL = yes; + # CHARGER_CROS_PCHG = yes; + # CHARGER_CROS_CONTROL = yes; + # SENSORS_CROS_EC = yes; + # MFD_CROS_EC_DEV = yes; + # REGULATOR_CROS_EC = yes; + # RTC_DRV_CROS_EC = yes; + # CROS_EC = lib.mkForce yes; + # CROS_EC_I2C = lib.mkForce yes; + # CROS_EC_SPI = lib.mkForce yes; + # EXTCON_USBC_CROS_EC = yes; # TODO: at least one of these is required for boot UNINLINE_SPIN_UNLOCK = yes; #< DOESN'T TAKE EFFECT