diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-03 15:50:19 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-31 18:06:09 +0300 |
commit | 96edbe4a0eaf192d970172351a685c9b5585a7ce (patch) | |
tree | b069266bcba27e83b26a3b8874b266c243cd89e6 /lib/systems/platforms.nix | |
parent | 87a68c455e7a5475e2a899a6f956da521afec715 (diff) | |
download | nixpkgs-96edbe4a0eaf192d970172351a685c9b5585a7ce.tar nixpkgs-96edbe4a0eaf192d970172351a685c9b5585a7ce.tar.gz nixpkgs-96edbe4a0eaf192d970172351a685c9b5585a7ce.tar.bz2 nixpkgs-96edbe4a0eaf192d970172351a685c9b5585a7ce.tar.lz nixpkgs-96edbe4a0eaf192d970172351a685c9b5585a7ce.tar.xz nixpkgs-96edbe4a0eaf192d970172351a685c9b5585a7ce.tar.zst nixpkgs-96edbe4a0eaf192d970172351a685c9b5585a7ce.zip |
linux_rpi: Specify defconfig in kernel expression
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.
Diffstat (limited to 'lib/systems/platforms.nix')
-rw-r--r-- | lib/systems/platforms.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 32f055b6b1c..00b2b683db0 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -167,7 +167,7 @@ rec { raspberrypi = { name = "raspberrypi"; kernelMajor = "2.6"; - kernelBaseConfig = "bcmrpi_defconfig"; + kernelBaseConfig = "bcm2835_defconfig"; kernelDTB = true; kernelArch = "arm"; kernelAutoModules = false; @@ -254,8 +254,6 @@ rec { raspberrypi2 = armv7l-hf-multiplatform // { name = "raspberrypi2"; - kernelBaseConfig = "bcm2709_defconfig"; - kernelDTB = true; kernelAutoModules = false; kernelExtraConfig = '' BLK_DEV_RAM y |