diff --git a/pkgs/additional/linux-sane-pinephonepro/default.nix b/pkgs/additional/linux-sane-pinephonepro/default.nix index 4179fc3d4..cdb8462e5 100644 --- a/pkgs/additional/linux-sane-pinephonepro/default.nix +++ b/pkgs/additional/linux-sane-pinephonepro/default.nix @@ -69,6 +69,7 @@ linux_latest.override { name = "reset-nixpkgs-overrides"; patch = null; extraStructuredConfig = with lib.kernel; { + # TODO: can these be removed? NR_CPUS = lib.mkForce (freeform "64"); ACPI_FPDT = lib.mkForce no; SLAB_BUCKETS = lib.mkForce no; @@ -79,37 +80,42 @@ linux_latest.override { TRANSPARENT_HUGEPAGE_MADVISE = lib.mkForce no; ZONE_DEVICE = lib.mkForce no; UEVENT_HELPER = lib.mkForce yes; - SYSFB_SIMPLEFB = lib.mkForce no; LOGO = lib.mkForce yes; LOGO_LINUX_CLUT224 = yes; - DRM_ACCEL = lib.mkForce no; POWERCAP = lib.mkForce no; CPUMASK_OFFSTACK = no; KFENCE = lib.mkForce no; - HARDLOCKUP_DETECTOR = lib.mkForce no; + # TODO: can these be removed? + # 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; + + # TODO: can these be removed? 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; - 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; WAN = lib.mkForce no; + + # TODO: can these be removed? + SYSFB_SIMPLEFB = lib.mkForce no; + DRM_ACCEL = lib.mkForce no; AUXDISPLAY = lib.mkForce no; DRM_DISPLAY_DP_AUX_CEC = lib.mkForce no; DRM_DISPLAY_DP_AUX_CHARDEV = lib.mkForce no; DRM_VC4_HDMI_CEC = lib.mkForce no; - EFI_ZBOOT = lib.mkForce no; + # TODO: can these be removed? NO_HZ_IDLE = yes; NO_HZ_FULL = lib.mkForce no; CONTEXT_TRACKING_USER = no; @@ -125,12 +131,11 @@ linux_latest.override { PRINTK_INDEX = lib.mkForce no; CRASH_RESERVE = yes; CRASH_DUMP = lib.mkForce yes; - STANDALONE = lib.mkForce yes; IO_STRICT_DEVMEM = no; RUNTIME_TESTING_MENU = lib.mkForce yes; - # upgrade `m` -> `y` + # upgrade `m` -> `y` (not required for boot) # INPUT_MATRIXKMAP = lib.mkForce yes; # I2C_CROS_EC_TUNNEL = yes; # CHARGER_CROS_PCHG = yes;