dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

linux_rpi: Specify defconfig in kernel expression

Browse Source 
In particular, now the mainline kernel can be built on the RPi 1 as well
(so kernelBaseConfig should always be a mainline defconfig from now on).
And RPi 2 users can now use linux_rpi without doing the
`nixpkgs.config.platform = lib.systems.platforms.raspberrypi2;` dance.
This commit is contained in:
Tuomas Tynkkynen 2017-11-03 15:50:19 +02:00 committed by Tuomas Tynkkynen
parent 87a68c455e
commit 96edbe4a0e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/systems/platforms.nix
View File

@ -167,7 +167,7 @@ rec {
raspberrypi = { raspberrypi = {
name = "raspberrypi"; name = "raspberrypi";
kernelMajor = "2.6"; kernelMajor = "2.6";
kernelBaseConfig = "bcmrpi_defconfig"; kernelBaseConfig = "bcm2835_defconfig";
kernelDTB = true; kernelDTB = true;
kernelArch = "arm"; kernelArch = "arm";
kernelAutoModules = false; kernelAutoModules = false;
@ -254,8 +254,6 @@ rec {
raspberrypi2 = armv7l-hf-multiplatform // { raspberrypi2 = armv7l-hf-multiplatform // {
name = "raspberrypi2"; name = "raspberrypi2";
kernelBaseConfig = "bcm2709_defconfig";
kernelDTB = true;
kernelAutoModules = false; kernelAutoModules = false;
kernelExtraConfig = '' kernelExtraConfig = ''
BLK_DEV_RAM y BLK_DEV_RAM y

5
pkgs/os-specific/linux/kernel/linux-rpi.nix
View File

@ -15,6 +15,11 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk"; sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk";
}; };
defconfig = {
"armv6l-linux" = "bcmrpi_defconfig";
"armv7l-linux" = "bcm2709_defconfig";
}.${stdenv.system} or (throw "linux_rpi not supported on '${stdenv.system}'");
features = { features = {
efiBootStub = false; efiBootStub = false;
} // (args.features or {}); } // (args.features or {});