nix/10.nixos-hardware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1841 from JamieMagee/raspberry-pi/structuredExtraConfig-only

Browse source 
raspberry-pi: add structuredExtraConfig for vendor kernel
This commit is contained in:
Doron Behar 2026-05-04 17:58:44 +00:00 • committed by GitHub
commit df7783100b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

39
raspberry-pi/common/kernel.nix
View file

@ -12,6 +12,7 @@ let
# NOTE: raspberryPiWirelessFirmware should be updated with this
modDirVersion = "6.12.75";
hash = "sha256-qrljd20n4tj/7C7gzNnxw7JIyEF2Ppf1PWm2a7vxh1w=";
inherit (lib.kernel) freeform yes no;
in
(buildLinux (
args
@ -50,6 +51,38 @@ in
request_key_helper
];
# Override nixpkgs common-config.nix defaults that conflict with the RPi vendor defconfigs.
# See: https://github.com/raspberrypi/linux/tree/rpi-6.12.y/arch/arm64/configs
structuredExtraConfig = {
# Vendor defconfigs set CONFIG_LOCALVERSION to -v7, -v8, -v8-16k, which
# breaks modDirVersion. Clear it.
LOCALVERSION = freeform "";
# RPi has 4 cores; nixpkgs common-config sets 384
NR_CPUS = lib.mkForce (freeform "4");
# nixpkgs sets 32MB; RPi vendor defconfig uses 5MB
CMA_SIZE_MBYTES = lib.mkForce (freeform "5");
# NFS root boot support (common RPi use case)
NFS_FS = lib.mkForce yes;
NFS_V4 = yes;
ROOT_NFS = yes;
IP_PNP = lib.mkForce yes;
IP_PNP_DHCP = yes;
IP_PNP_RARP = yes;
# Match vendor defconfig: built-in instead of module
NET_CLS_BPF = lib.mkForce yes;
NLS_CODEPAGE_437 = lib.mkForce yes;
FB_SIMPLE = yes;
}
# arm64 vendor defconfigs (bcm2711, bcm2712) use full preempt;
# arm32 ones (bcmrpi, bcm2709) use voluntary preempt (nixpkgs default)
// lib.optionalAttrs (rpiVersion >= 3) {
PREEMPT = lib.mkForce yes;
PREEMPT_VOLUNTARY = lib.mkForce no;
};
extraMeta =
if (rpiVersion < 3) then
{
@ -66,12 +99,6 @@ in
// (args.argsOverride or { })
)).overrideAttrs
{
postConfigure = ''
# The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
sed -i $buildRoot/include/config/auto.conf -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
'';
# The vendor kernel uses different DTB names (bcm2708/bcm2709/bcm2710) than what
# U-Boot expects (bcm2835/bcm2836/bcm2837). Starting with Pi 4, names match.
# See: https://github.com/u-boot/u-boot/blob/master/board/raspberrypi/rpi/rpi.c