diff --git a/modules/nixos/hardware/raspberry-pi/default.nix b/modules/nixos/hardware/raspberry-pi/default.nix index 0cdb2e9..190e3f6 100644 --- a/modules/nixos/hardware/raspberry-pi/default.nix +++ b/modules/nixos/hardware/raspberry-pi/default.nix @@ -276,8 +276,10 @@ in # Common Raspberry Pi packages environment.systemPackages = with pkgs; [ + dconf i2c-tools raspberrypi-eeprom + pkgs.${namespace}.raspberrypi-utils pkgs.${namespace}.raspberrypifw pkgs.${namespace}.raspberryPiWirelessFirmware raspberrypi-armstubs diff --git a/packages/linux-cachyos/config-nix/aarch64-linux/cachyos-server-lto-16k.aarch64-linux.nix b/packages/linux-cachyos/config-nix/aarch64-linux/cachyos-server-lto-16k.aarch64-linux.nix index b4c19a1..8df982a 100644 --- a/packages/linux-cachyos/config-nix/aarch64-linux/cachyos-server-lto-16k.aarch64-linux.nix +++ b/packages/linux-cachyos/config-nix/aarch64-linux/cachyos-server-lto-16k.aarch64-linux.nix @@ -5,9 +5,9 @@ "CONFIG_CLANG_VERSION" = "210102"; "CONFIG_AS_IS_LLVM" = "y"; "CONFIG_AS_VERSION" = "210102"; - "CONFIG_LD_IS_BFD" = "y"; - "CONFIG_LD_VERSION" = "24400"; - "CONFIG_LLD_VERSION" = "0"; + "CONFIG_LD_VERSION" = "0"; + "CONFIG_LD_IS_LLD" = "y"; + "CONFIG_LLD_VERSION" = "210102"; "CONFIG_RUSTC_VERSION" = "0"; "CONFIG_RUSTC_LLVM_VERSION" = "0"; "CONFIG_CC_HAS_ASM_GOTO_OUTPUT" = "y"; @@ -31,7 +31,6 @@ "CONFIG_DEFAULT_HOSTNAME" = "cachyos"; "CONFIG_SYSVIPC" = "y"; "CONFIG_SYSVIPC_SYSCTL" = "y"; - "CONFIG_SYSVIPC_COMPAT" = "y"; "CONFIG_POSIX_MQUEUE" = "y"; "CONFIG_POSIX_MQUEUE_SYSCTL" = "y"; "CONFIG_WATCH_QUEUE" = "y"; @@ -183,9 +182,7 @@ "CONFIG_LD_ORPHAN_WARN" = "y"; "CONFIG_LD_ORPHAN_WARN_LEVEL" = "warn"; "CONFIG_SYSCTL" = "y"; - "CONFIG_HAVE_UID16" = "y"; "CONFIG_SYSCTL_EXCEPTION_TRACE" = "y"; - "CONFIG_UID16" = "y"; "CONFIG_MULTIUSER" = "y"; "CONFIG_FHANDLE" = "y"; "CONFIG_POSIX_TIMERS" = "y"; @@ -233,11 +230,11 @@ "CONFIG_CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS" = "y"; "CONFIG_64BIT" = "y"; "CONFIG_MMU" = "y"; - "CONFIG_ARM64_CONT_PTE_SHIFT" = "4"; - "CONFIG_ARM64_CONT_PMD_SHIFT" = "4"; - "CONFIG_ARCH_MMAP_RND_BITS_MIN" = "18"; - "CONFIG_ARCH_MMAP_RND_BITS_MAX" = "33"; - "CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN" = "11"; + "CONFIG_ARM64_CONT_PTE_SHIFT" = "7"; + "CONFIG_ARM64_CONT_PMD_SHIFT" = "5"; + "CONFIG_ARCH_MMAP_RND_BITS_MIN" = "16"; + "CONFIG_ARCH_MMAP_RND_BITS_MAX" = "31"; + "CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN" = "9"; "CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX" = "16"; "CONFIG_STACKTRACE_SUPPORT" = "y"; "CONFIG_ILLEGAL_POINTER_VALUE" = "0xdead000000000000"; @@ -250,7 +247,7 @@ "CONFIG_SMP" = "y"; "CONFIG_KERNEL_MODE_NEON" = "y"; "CONFIG_FIX_EARLYCON_MEM" = "y"; - "CONFIG_PGTABLE_LEVELS" = "5"; + "CONFIG_PGTABLE_LEVELS" = "4"; "CONFIG_ARCH_SUPPORTS_UPROBES" = "y"; "CONFIG_ARCH_PROC_KCORE_TEXT" = "y"; "CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC" = "y"; @@ -262,11 +259,8 @@ "CONFIG_ARM64_ERRATUM_824069" = "y"; "CONFIG_ARM64_ERRATUM_819472" = "y"; "CONFIG_ARM64_ERRATUM_832075" = "y"; - "CONFIG_ARM64_ERRATUM_1742098" = "y"; - "CONFIG_ARM64_ERRATUM_845719" = "y"; "CONFIG_ARM64_ERRATUM_843419" = "y"; "CONFIG_ARM64_ERRATUM_1024718" = "y"; - "CONFIG_ARM64_ERRATUM_1418040" = "y"; "CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT" = "y"; "CONFIG_ARM64_ERRATUM_1165522" = "y"; "CONFIG_ARM64_ERRATUM_1319367" = "y"; @@ -303,7 +297,7 @@ "CONFIG_ROCKCHIP_ERRATUM_3568002" = "y"; "CONFIG_ROCKCHIP_ERRATUM_3588001" = "y"; "CONFIG_SOCIONEXT_SYNQUACER_PREITS" = "y"; - "CONFIG_ARM64_4K_PAGES" = "y"; + "CONFIG_ARM64_16K_PAGES" = "y"; "CONFIG_ARM64_VA_BITS_52" = "y"; "CONFIG_ARM64_VA_BITS" = "52"; "CONFIG_ARM64_PA_BITS_52" = "y"; @@ -335,12 +329,10 @@ "CONFIG_TRANS_TABLE" = "y"; "CONFIG_XEN_DOM0" = "y"; "CONFIG_XEN" = "y"; - "CONFIG_ARCH_FORCE_MAX_ORDER" = "10"; + "CONFIG_ARCH_FORCE_MAX_ORDER" = "11"; "CONFIG_UNMAP_KERNEL_AT_EL0" = "y"; "CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY" = "y"; "CONFIG_ARM64_TAGGED_ADDR_ABI" = "y"; - "CONFIG_COMPAT" = "y"; - "CONFIG_KUSER_HELPERS" = "y"; "CONFIG_ARM64_HW_AFDBM" = "y"; "CONFIG_ARM64_PAN" = "y"; "CONFIG_ARM64_LSE_ATOMICS" = "y"; @@ -473,7 +465,6 @@ "CONFIG_PMIC_OPREGION" = "y"; "CONFIG_ACPI_VIOT" = "y"; "CONFIG_ACPI_PRMT" = "y"; - "CONFIG_VIRT_XFER_TO_GUEST_WORK" = "y"; "CONFIG_VIRTUALIZATION" = "y"; "CONFIG_HAVE_LIVEPATCH" = "y"; "CONFIG_CPU_MITIGATIONS" = "y"; @@ -529,7 +520,6 @@ "CONFIG_HAVE_ALIGNED_STRUCT_PAGE" = "y"; "CONFIG_HAVE_CMPXCHG_LOCAL" = "y"; "CONFIG_HAVE_CMPXCHG_DOUBLE" = "y"; - "CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION" = "y"; "CONFIG_HAVE_ARCH_SECCOMP" = "y"; "CONFIG_HAVE_ARCH_SECCOMP_FILTER" = "y"; "CONFIG_SECCOMP" = "y"; @@ -539,9 +529,12 @@ "CONFIG_STACKPROTECTOR" = "y"; "CONFIG_STACKPROTECTOR_STRONG" = "y"; "CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK" = "y"; + "CONFIG_LTO" = "y"; + "CONFIG_LTO_CLANG" = "y"; "CONFIG_ARCH_SUPPORTS_LTO_CLANG" = "y"; "CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN" = "y"; - "CONFIG_LTO_NONE" = "y"; + "CONFIG_HAS_LTO_CLANG" = "y"; + "CONFIG_LTO_CLANG_THIN" = "y"; "CONFIG_ARCH_SUPPORTS_CFI" = "y"; "CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS" = "y"; "CONFIG_HAVE_CONTEXT_TRACKING_USER" = "y"; @@ -561,19 +554,15 @@ "CONFIG_SOFTIRQ_ON_OWN_STACK" = "y"; "CONFIG_ARCH_HAS_ELF_RANDOMIZE" = "y"; "CONFIG_HAVE_ARCH_MMAP_RND_BITS" = "y"; - "CONFIG_ARCH_MMAP_RND_BITS" = "18"; - "CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS" = "y"; - "CONFIG_ARCH_MMAP_RND_COMPAT_BITS" = "11"; - "CONFIG_HAVE_PAGE_SIZE_4KB" = "y"; - "CONFIG_PAGE_SIZE_4KB" = "y"; + "CONFIG_ARCH_MMAP_RND_BITS" = "16"; + "CONFIG_HAVE_PAGE_SIZE_16KB" = "y"; + "CONFIG_PAGE_SIZE_16KB" = "y"; "CONFIG_PAGE_SIZE_LESS_THAN_64KB" = "y"; "CONFIG_PAGE_SIZE_LESS_THAN_256KB" = "y"; - "CONFIG_PAGE_SHIFT" = "12"; + "CONFIG_PAGE_SHIFT" = "14"; "CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT" = "y"; "CONFIG_HAVE_RELIABLE_STACKTRACE" = "y"; "CONFIG_CLONE_BACKWARDS" = "y"; - "CONFIG_OLD_SIGSUSPEND3" = "y"; - "CONFIG_COMPAT_OLD_SIGACTION" = "y"; "CONFIG_COMPAT_32BIT_TIME" = "y"; "CONFIG_ARCH_SUPPORTS_RT" = "y"; "CONFIG_HAVE_ARCH_VMAP_STACK" = "y"; @@ -733,7 +722,6 @@ "CONFIG_ARCH_HAS_SYSCALL_WRAPPER" = "y"; "CONFIG_FREEZER" = "y"; "CONFIG_BINFMT_ELF" = "y"; - "CONFIG_COMPAT_BINFMT_ELF" = "y"; "CONFIG_ARCH_BINFMT_ELF_STATE" = "y"; "CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS" = "y"; "CONFIG_ARCH_HAVE_ELF_PROT" = "y"; @@ -801,12 +789,10 @@ "CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE" = "y"; "CONFIG_MEMORY_FAILURE" = "y"; "CONFIG_HWPOISON_INJECT" = "m"; - "CONFIG_ARCH_WANTS_THP_SWAP" = "y"; "CONFIG_PERSISTENT_HUGE_ZERO_FOLIO" = "y"; "CONFIG_MM_ID" = "y"; "CONFIG_TRANSPARENT_HUGEPAGE" = "y"; "CONFIG_TRANSPARENT_HUGEPAGE_MADVISE" = "y"; - "CONFIG_THP_SWAP" = "y"; "CONFIG_READ_ONLY_THP_FOR_FS" = "y"; "CONFIG_PAGE_MAPCOUNT" = "y"; "CONFIG_PGTABLE_HAS_HUGE_LEAVES" = "y"; @@ -833,7 +819,6 @@ "CONFIG_HMM_MIRROR" = "y"; "CONFIG_GET_FREE_REGION" = "y"; "CONFIG_DEVICE_PRIVATE" = "y"; - "CONFIG_VMAP_PFN" = "y"; "CONFIG_ARCH_USES_HIGH_VMA_FLAGS" = "y"; "CONFIG_ARCH_HAS_PKEYS" = "y"; "CONFIG_ARCH_USES_PG_ARCH_2" = "y"; @@ -866,7 +851,6 @@ "CONFIG_DAMON_LRU_SORT" = "y"; "CONFIG_DAMON_STAT" = "y"; "CONFIG_NET" = "y"; - "CONFIG_COMPAT_NETLINK_MESSAGES" = "y"; "CONFIG_NET_INGRESS" = "y"; "CONFIG_NET_EGRESS" = "y"; "CONFIG_NET_XGRESS" = "y"; @@ -1092,7 +1076,6 @@ "CONFIG_NF_FLOW_TABLE" = "m"; "CONFIG_NF_FLOW_TABLE_PROCFS" = "y"; "CONFIG_NETFILTER_XTABLES" = "m"; - "CONFIG_NETFILTER_XTABLES_COMPAT" = "y"; "CONFIG_NETFILTER_XTABLES_LEGACY" = "y"; "CONFIG_NETFILTER_XT_MARK" = "m"; "CONFIG_NETFILTER_XT_CONNMARK" = "m"; @@ -1881,7 +1864,6 @@ "CONFIG_MTDRAM_TOTAL_SIZE" = "4096"; "CONFIG_MTDRAM_ERASE_SIZE" = "128"; "CONFIG_MTD_BLOCK2MTD" = "m"; - "CONFIG_MTD_INTEL_DG" = "m"; "CONFIG_MTD_NAND_CORE" = "m"; "CONFIG_MTD_RAW_NAND" = "m"; "CONFIG_MTD_NAND_NANDSIM" = "m"; @@ -5313,7 +5295,6 @@ "CONFIG_VIDEO" = "y"; "CONFIG_DRM" = "y"; "CONFIG_DRM_MIPI_DBI" = "m"; - "CONFIG_DRM_MIPI_DSI" = "y"; "CONFIG_DRM_KMS_HELPER" = "y"; "CONFIG_DRM_DRAW" = "y"; "CONFIG_DRM_PANIC" = "y"; @@ -5334,7 +5315,6 @@ "CONFIG_DRM_DISPLAY_DP_AUX_CEC" = "y"; "CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV" = "y"; "CONFIG_DRM_DISPLAY_DP_HELPER" = "y"; - "CONFIG_DRM_DISPLAY_DP_TUNNEL" = "y"; "CONFIG_DRM_DISPLAY_DSC_HELPER" = "y"; "CONFIG_DRM_DISPLAY_HDCP_HELPER" = "y"; "CONFIG_DRM_DISPLAY_HDMI_CEC_NOTIFIER_HELPER" = "y"; @@ -5342,7 +5322,6 @@ "CONFIG_DRM_TTM" = "m"; "CONFIG_DRM_EXEC" = "m"; "CONFIG_DRM_GPUVM" = "m"; - "CONFIG_DRM_GPUSVM" = "m"; "CONFIG_DRM_BUDDY" = "m"; "CONFIG_DRM_VRAM_HELPER" = "m"; "CONFIG_DRM_TTM_HELPER" = "m"; @@ -5371,20 +5350,6 @@ "CONFIG_DRM_NOUVEAU_SVM" = "y"; "CONFIG_DRM_NOUVEAU_CH7006" = "m"; "CONFIG_DRM_NOUVEAU_SIL164" = "m"; - "CONFIG_DRM_XE" = "m"; - "CONFIG_DRM_XE_DISPLAY" = "y"; - "CONFIG_DRM_XE_DP_TUNNEL" = "y"; - "CONFIG_DRM_XE_GPUSVM" = "y"; - "CONFIG_DRM_XE_PAGEMAP" = "y"; - "CONFIG_DRM_XE_FORCE_PROBE" = ""; - "CONFIG_DRM_XE_JOB_TIMEOUT_MAX" = "10000"; - "CONFIG_DRM_XE_JOB_TIMEOUT_MIN" = "1"; - "CONFIG_DRM_XE_TIMESLICE_MAX" = "10000000"; - "CONFIG_DRM_XE_TIMESLICE_MIN" = "1"; - "CONFIG_DRM_XE_PREEMPT_TIMEOUT" = "640000"; - "CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX" = "10000000"; - "CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN" = "1"; - "CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT" = "y"; "CONFIG_DRM_VGEM" = "m"; "CONFIG_DRM_VKMS" = "m"; "CONFIG_DRM_VMWGFX" = "m"; @@ -5398,7 +5363,6 @@ "CONFIG_DRM_PANEL_AUO_A030JTN01" = "m"; "CONFIG_DRM_PANEL_ILITEK_ILI9341" = "m"; "CONFIG_DRM_PANEL_ORISETECH_OTA5601A" = "m"; - "CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN" = "m"; "CONFIG_DRM_PANEL_WIDECHIPS_WS2401" = "m"; "CONFIG_DRM_BRIDGE" = "y"; "CONFIG_DRM_PANEL_BRIDGE" = "y"; @@ -5701,7 +5665,6 @@ "CONFIG_SND_HDA_CORE" = "m"; "CONFIG_SND_HDA_DSP_LOADER" = "y"; "CONFIG_SND_HDA_COMPONENT" = "y"; - "CONFIG_SND_HDA_I915" = "y"; "CONFIG_SND_HDA_EXT_CORE" = "m"; "CONFIG_SND_INTEL_NHLT" = "y"; "CONFIG_SND_INTEL_DSP_CONFIG" = "m"; @@ -6936,7 +6899,6 @@ "CONFIG_HYPERV_UTILS" = "m"; "CONFIG_HYPERV_BALLOON" = "m"; "CONFIG_HYPERV_VMBUS" = "m"; - "CONFIG_MSHV_ROOT" = "m"; "CONFIG_XEN_BALLOON" = "y"; "CONFIG_XEN_BALLOON_MEMORY_HOTPLUG" = "y"; "CONFIG_XEN_SCRUB_PAGES_DEFAULT" = "y"; @@ -8441,7 +8403,6 @@ "CONFIG_XXHASH" = "y"; "CONFIG_AUDIT_GENERIC" = "y"; "CONFIG_AUDIT_ARCH_COMPAT_GENERIC" = "y"; - "CONFIG_AUDIT_COMPAT_GENERIC" = "y"; "CONFIG_842_COMPRESS" = "m"; "CONFIG_842_DECOMPRESS" = "m"; "CONFIG_ZLIB_INFLATE" = "y"; diff --git a/packages/raspberrypi/uefi-rpi5/default.nix b/packages/raspberrypi/uefi-rpi5/default.nix index a25a0dc..a24eb6a 100644 --- a/packages/raspberrypi/uefi-rpi5/default.nix +++ b/packages/raspberrypi/uefi-rpi5/default.nix @@ -7,8 +7,10 @@ let defaultConfig = '' EOF armstub=RPI_EFI.fd - device_tree_address=0x3e0000 - device_tree_end=0x400000 + # device_tree_address=0x3e0000 + # device_tree_end=0x400000 + device_tree_address=0x1f0000 + device_tree_end=0x210000 # Force 32 bpp framebuffer allocation. framebuffer_depth=32 diff --git a/systems/aarch64-linux/pi5/boot.nix b/systems/aarch64-linux/pi5/boot.nix index a9b7cc6..458c4af 100755 --- a/systems/aarch64-linux/pi5/boot.nix +++ b/systems/aarch64-linux/pi5/boot.nix @@ -10,8 +10,8 @@ # bootloader = "kernel"; # firmwarePackage = pkgs.raspberrypifw; # }; - kernelPackages = pkgs.${namespace}.linux-rpi5; - supportedFilesystems = lib.mkForce [ ]; + kernelPackages = pkgs.${namespace}.linuxPackages_cachyos-server-lto; + #supportedFilesystems = lib.mkForce [ ]; }; ${namespace}.hardware.raspberry-pi.config = { diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix index 7c4874e..5d44044 100644 --- a/systems/aarch64-linux/pi5/default.nix +++ b/systems/aarch64-linux/pi5/default.nix @@ -46,7 +46,7 @@ enable = true; firmware = { enableFirmware = true; - firmwareDisk = "/dev/mmcblk0"; + firmwareDisk = "/dev/mmcblk1"; }; }; raspberry-pi = {