colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

moby: remove most kernel config overrides

Browse Source 
PPP still boots -- but only using my patched u-boot.
stock u-boot will fail to load it, because its slightly greater than
the limit of 63.5 MiB.
This commit is contained in:
Colin
2024-09-26 06:56:21 +00:00
parent 9aebaba1d6
commit 3b573b8653
2 changed files with 147 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/modules/hal/pine64-pinephone-pro.nix
View File

@@ -28,8 +28,8 @@ in
# - cameras, sound, etc untested # - cameras, sound, etc untested
# - linux-sane-pinephonepro (6.11.0; pmos config + nixpkgs config): FAILS TO BOOT # - linux-sane-pinephonepro (6.11.0; pmos config + nixpkgs config): FAILS TO BOOT
# boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux-postmarketos-pinephonepro; # boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux-postmarketos-pinephonepro;
# boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux-sane-pinephonepro; boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux-sane-pinephonepro;
boot.kernelPackages = pkgs.linuxPackagesFor myCustomKernel; # boot.kernelPackages = pkgs.linuxPackagesFor myCustomKernel;
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [
# see <repo:postmarketOS/pmaports:device/community/device-pine64-pinephonepro/modules-initfs> # see <repo:postmarketOS/pmaports:device/community/device-pine64-pinephonepro/modules-initfs>

290
pkgs/additional/linux-sane-pinephonepro/default.nix
View File

@@ -101,43 +101,43 @@ linux_latest.override {
VIDEO_SUNXI = yes; VIDEO_SUNXI = yes;
}; };
} }
{ # {
name = "reset-nixpkgs-overrides"; # name = "reset-nixpkgs-overrides";
patch = null; # patch = null;
extraStructuredConfig = with lib.kernel; { # extraStructuredConfig = with lib.kernel; {
# this is required for boot (but why??) # # this is required for boot (but why??)
ACPI_FPDT = lib.mkForce no; # ACPI_FPDT = lib.mkForce no;
# this is required for boot (but why??) # # this is required for boot (but why??)
SHUFFLE_PAGE_ALLOCATOR = lib.mkForce no; # SHUFFLE_PAGE_ALLOCATOR = lib.mkForce no;
# this is required for boot (but autoModules gets that for us) # # this is required for boot (but autoModules gets that for us)
# TRANSPARENT_HUGEPAGE_ALWAYS = lib.mkForce yes; # # TRANSPARENT_HUGEPAGE_ALWAYS = lib.mkForce yes;
# this is required for boot # # this is required for boot
SYSFB_SIMPLEFB = lib.mkForce no; # SYSFB_SIMPLEFB = lib.mkForce no;
# this is required for boot (but why??) # # this is required for boot (but why??)
IO_STRICT_DEVMEM = no; # IO_STRICT_DEVMEM = no;
# this is required for boot (but why??) # # this is required for boot (but why??)
PRINTK_INDEX = lib.mkForce no; # PRINTK_INDEX = lib.mkForce no;
# this is required for boot (but why??) # # this is required for boot (but why??)
CRASH_RESERVE = yes; # CRASH_RESERVE = yes;
# this is required for boot (but why??) # # this is required for boot (but why??)
PREEMPT = lib.mkForce yes; # PREEMPT = lib.mkForce yes;
# this is required for boot (but why??) # # this is required for boot (but why??)
PREEMPT_VOLUNTARY_BUILD = no; # PREEMPT_VOLUNTARY_BUILD = no;
# this is required for boot (but why??) # # this is required for boot (but why??)
MMC_BLOCK_MINORS = lib.mkForce (freeform "256"); # MMC_BLOCK_MINORS = lib.mkForce (freeform "256");
# this is required for boot (but why??) # # this is required for boot (but why??)
MEDIA_PCI_SUPPORT = lib.mkForce no; # MEDIA_PCI_SUPPORT = lib.mkForce no;
}; # };
} # }
{ {
# i suspect that u-boot can only load a (decompressed) image up to 64 MiB in size for this platform. # i suspect that u-boot can only load a (decompressed) image up to 64 MiB in size for this platform.
# i say that because `CONFIG_DEBUG_INFO=y` seemed to break the boot, # i say that because `CONFIG_DEBUG_INFO=y` seemed to break the boot,
@@ -171,133 +171,133 @@ linux_latest.override {
SUNRPC_DEBUG = lib.mkForce no; SUNRPC_DEBUG = lib.mkForce no;
}; };
} }
{ # {
name = "reset-automodules-overrides"; # name = "reset-automodules-overrides";
patch = null; # patch = null;
extraStructuredConfig = with lib.kernel; { # extraStructuredConfig = with lib.kernel; {
# NR_CPUS = lib.mkForce (freeform "64"); # # NR_CPUS = lib.mkForce (freeform "64");
# RANDOM_KMALLOC_CACHES = lib.mkForce no; # # RANDOM_KMALLOC_CACHES = lib.mkForce no;
# HOTPLUG_PCI_PCIE = lib.mkForce no; # # HOTPLUG_PCI_PCIE = lib.mkForce no;
# DRM_ACCEL = lib.mkForce no; # # DRM_ACCEL = lib.mkForce no;
# KFENCE = lib.mkForce no; # # KFENCE = lib.mkForce no;
BLK_INLINE_ENCRYPTION = lib.mkForce no; # BLK_INLINE_ENCRYPTION = lib.mkForce no;
CRASH_DUMP = lib.mkForce yes; # CRASH_DUMP = lib.mkForce yes;
PREEMPTION = yes; # PREEMPTION = yes;
PREEMPT_BUILD = yes; # PREEMPT_BUILD = yes;
PREEMPT_COUNT = yes; # PREEMPT_COUNT = yes;
PREEMPT_RCU = yes; # PREEMPT_RCU = yes;
RUNTIME_TESTING_MENU = lib.mkForce yes; # RUNTIME_TESTING_MENU = lib.mkForce yes;
# TODO: one of these is required for boot? # # TODO: one of these is required for boot?
BT_HCIUART_BCSP = lib.mkForce no; # BT_HCIUART_BCSP = lib.mkForce no;
DRM_NOUVEAU_GSP_DEFAULT = lib.mkForce no; # DRM_NOUVEAU_GSP_DEFAULT = lib.mkForce no;
PINCTRL_AMD = lib.mkForce no; # PINCTRL_AMD = lib.mkForce no;
# TODO: at least one of these is required for boot # # TODO: at least one of these is required for boot
NO_HZ_IDLE = yes; # NO_HZ_IDLE = yes;
NO_HZ_FULL = lib.mkForce no; # NO_HZ_FULL = lib.mkForce no;
# CONTEXT_TRACKING_USER = no; # # CONTEXT_TRACKING_USER = no;
TICK_CPU_ACCOUNTING = yes; # TICK_CPU_ACCOUNTING = yes;
VIRT_CPU_ACCOUNTING = no; # VIRT_CPU_ACCOUNTING = no;
TASKS_RCU = yes; # TASKS_RCU = yes;
STANDALONE = lib.mkForce yes; # STANDALONE = lib.mkForce yes;
# TODO: one of these is required for boot? # # TODO: one of these is required for boot?
ATH10K_DFS_CERTIFIED = lib.mkForce no; # ATH10K_DFS_CERTIFIED = lib.mkForce no;
CHROMEOS_TBMC = lib.mkForce no; # CHROMEOS_TBMC = lib.mkForce no;
MOUSE_ELAN_I2C_SMBUS = lib.mkForce no; # MOUSE_ELAN_I2C_SMBUS = lib.mkForce no;
XFRM_ESPINTCP = no; # XFRM_ESPINTCP = no;
# AUXDISPLAY = lib.mkForce no; # # AUXDISPLAY = lib.mkForce no;
# DRM_DISPLAY_DP_AUX_CEC = lib.mkForce no; # # DRM_DISPLAY_DP_AUX_CEC = lib.mkForce no;
# DRM_DISPLAY_DP_AUX_CHARDEV = lib.mkForce no; # # DRM_DISPLAY_DP_AUX_CHARDEV = lib.mkForce no;
# DRM_VC4_HDMI_CEC = lib.mkForce no; # # DRM_VC4_HDMI_CEC = lib.mkForce no;
# TODO: one of these is required for boot? # # TODO: one of these is required for boot?
SLAB_BUCKETS = lib.mkForce no; # SLAB_BUCKETS = lib.mkForce no;
DEFAULT_MMAP_MIN_ADDR = lib.mkForce (freeform "4096"); # DEFAULT_MMAP_MIN_ADDR = lib.mkForce (freeform "4096");
TRANSPARENT_HUGEPAGE_MADVISE = lib.mkForce no; # TRANSPARENT_HUGEPAGE_MADVISE = lib.mkForce no;
ZONE_DEVICE = lib.mkForce no; # ZONE_DEVICE = lib.mkForce no;
UEVENT_HELPER = lib.mkForce yes; # UEVENT_HELPER = lib.mkForce yes;
LOGO = lib.mkForce yes; # LOGO = lib.mkForce yes;
LOGO_LINUX_CLUT224 = yes; # LOGO_LINUX_CLUT224 = yes;
POWERCAP = lib.mkForce no; # POWERCAP = lib.mkForce no;
# CPUMASK_OFFSTACK = no; # # CPUMASK_OFFSTACK = no;
# or maybe this? # # or maybe this?
HID_BPF = lib.mkForce no; # HID_BPF = lib.mkForce no;
# TODO: one of these is required for boot? # # TODO: one of these is required for boot?
USB_SERIAL = lib.mkForce module; # USB_SERIAL = lib.mkForce module;
FSL_MC_UAPI_SUPPORT = lib.mkForce no; # FSL_MC_UAPI_SUPPORT = lib.mkForce no;
NET_FC = lib.mkForce no; # NET_FC = lib.mkForce no;
NET_VENDOR_MEDIATEK = lib.mkForce no; # NET_VENDOR_MEDIATEK = lib.mkForce no;
WAN = lib.mkForce no; # WAN = lib.mkForce no;
# or maybe one of these? # # or maybe one of these?
HARDLOCKUP_DETECTOR = lib.mkForce no; # HARDLOCKUP_DETECTOR = lib.mkForce no;
U_SERIAL_CONSOLE = lib.mkForce no; # U_SERIAL_CONSOLE = lib.mkForce no;
WATCH_QUEUE = lib.mkForce no; # WATCH_QUEUE = lib.mkForce no;
SCHED_CORE = lib.mkForce no; # SCHED_CORE = lib.mkForce no;
BPF_JIT_ALWAYS_ON = lib.mkForce yes; # BPF_JIT_ALWAYS_ON = lib.mkForce yes;
PARAVIRT_TIME_ACCOUNTING = lib.mkForce no; # PARAVIRT_TIME_ACCOUNTING = lib.mkForce no;
ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION = yes; #< does not take effect # ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION = yes; #< does not take effect
COMPAT_ALIGNMENT_FIXUPS = lib.mkForce no; # COMPAT_ALIGNMENT_FIXUPS = lib.mkForce no;
IDLE_PAGE_TRACKING = lib.mkForce no; # IDLE_PAGE_TRACKING = lib.mkForce no;
PAGE_IDLE_FLAG = no; # PAGE_IDLE_FLAG = no;
EFI_ZBOOT = lib.mkForce no; # EFI_ZBOOT = lib.mkForce no;
ZRAM_MULTI_COMP = lib.mkForce no; # ZRAM_MULTI_COMP = lib.mkForce no;
# upgrade `m` -> `y` # # upgrade `m` -> `y`
# INPUT_MATRIXKMAP = lib.mkForce yes; # # INPUT_MATRIXKMAP = lib.mkForce yes;
# I2C_CROS_EC_TUNNEL = yes; # # I2C_CROS_EC_TUNNEL = yes;
# CHARGER_CROS_PCHG = yes; # # CHARGER_CROS_PCHG = yes;
# CHARGER_CROS_CONTROL = yes; # # CHARGER_CROS_CONTROL = yes;
# SENSORS_CROS_EC = yes; # # SENSORS_CROS_EC = yes;
# MFD_CROS_EC_DEV = yes; # # MFD_CROS_EC_DEV = yes;
# REGULATOR_CROS_EC = yes; # # REGULATOR_CROS_EC = yes;
# RTC_DRV_CROS_EC = yes; # # RTC_DRV_CROS_EC = yes;
# CROS_EC = lib.mkForce yes; # # CROS_EC = lib.mkForce yes;
# CROS_EC_I2C = lib.mkForce yes; # # CROS_EC_I2C = lib.mkForce yes;
# CROS_EC_SPI = lib.mkForce yes; # # CROS_EC_SPI = lib.mkForce yes;
# EXTCON_USBC_CROS_EC = yes; # # EXTCON_USBC_CROS_EC = yes;
# TODO: at least one of these is required for boot # # TODO: at least one of these is required for boot
# UNINLINE_SPIN_UNLOCK = yes; #< DOESN'T TAKE EFFECT # # UNINLINE_SPIN_UNLOCK = yes; #< DOESN'T TAKE EFFECT
# CMA_SIZE_MBYTES = lib.mkForce (freeform "256"); # # CMA_SIZE_MBYTES = lib.mkForce (freeform "256");
SOFTLOCKUP_DETECTOR_INTR_STORM = no; # SOFTLOCKUP_DETECTOR_INTR_STORM = no;
LDM_PARTITION = lib.mkForce no; # LDM_PARTITION = lib.mkForce no;
DAMON = lib.mkForce no; # DAMON = lib.mkForce no;
SKB_DECRYPTED = no; #< does not take effect # SKB_DECRYPTED = no; #< does not take effect
CFG80211_CERTIFICATION_ONUS = lib.mkForce no; # CFG80211_CERTIFICATION_ONUS = lib.mkForce no;
MAC80211_DEBUGFS = lib.mkForce no; # MAC80211_DEBUGFS = lib.mkForce no;
SOCK_VALIDATE_XMIT = no; #< does not take effect # SOCK_VALIDATE_XMIT = no; #< does not take effect
ACCESSIBILITY = lib.mkForce no; # ACCESSIBILITY = lib.mkForce no;
VIRTIO_MMIO_CMDLINE_DEVICES = lib.mkForce no; # VIRTIO_MMIO_CMDLINE_DEVICES = lib.mkForce no;
DEBUG_INFO = no; # DEBUG_INFO = no;
SCHED_DEBUG = lib.mkForce no; # SCHED_DEBUG = lib.mkForce no;
FUNCTION_PROFILER = lib.mkForce no; # FUNCTION_PROFILER = lib.mkForce no;
SCHED_TRACER = lib.mkForce no; # SCHED_TRACER = lib.mkForce no;
DEBUG_INFO_NONE = yes; # DEBUG_INFO_NONE = yes;
TLS = lib.mkForce no; # TLS = lib.mkForce no;
XDP_SOCKETS_DIAG = lib.mkForce no; # XDP_SOCKETS_DIAG = lib.mkForce no;
IP_PNP = lib.mkForce yes; # IP_PNP = lib.mkForce yes;
# IP_PNP_DHCP = yes; # # IP_PNP_DHCP = yes;
# IP_PNP_BOOTP = yes; # # IP_PNP_BOOTP = yes;
IP_DCCP_CCID3 = lib.mkForce yes; # IP_DCCP_CCID3 = lib.mkForce yes;
# IP_DCCP_TFRC_LIB = yes; # # IP_DCCP_TFRC_LIB = yes;
RTW88 = lib.mkForce no; # RTW88 = lib.mkForce no;
MEDIA_CEC_RC = lib.mkForce no; # MEDIA_CEC_RC = lib.mkForce no;
CRYPTO_TEST = lib.mkForce module; # CRYPTO_TEST = lib.mkForce module;
PROC_VMCORE = yes; #< does not take effect ?? # PROC_VMCORE = yes; #< does not take effect ??
# or maybe it's one of these? # # or maybe it's one of these?
FUSION = lib.mkForce no; # FUSION = lib.mkForce no;
HIPPI = lib.mkForce no; # HIPPI = lib.mkForce no;
BRCMFMAC_PCIE = lib.mkForce no; # BRCMFMAC_PCIE = lib.mkForce no;
MOUSE_PS2_ELANTECH = lib.mkForce no; # MOUSE_PS2_ELANTECH = lib.mkForce no;
INFINIBAND = lib.mkForce no; # INFINIBAND = lib.mkForce no;
}; # };
} # }
]; ];
} }