JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
a7ed499450
nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix

61 lines
2.3 KiB
Nix
Raw Normal View History

linux_rpi: Extend the logic for not installing unnecessary DTBs Now ARMv6 and ARMv7 builds avoid installing DTBs for boards where the resulting kernel won't run just like the aarch64 builds already do. Also deduplicates the logic a bit.
2018-09-20 14:41:04 +01:00
{ stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args:
Adding linux-3.6-rpi I picked the change from https://github.com/aforemny/nixpkgs/commit/7b4d69eeff2eb10c395c8d1a52a0c1e246cddb45
2012-12-27 21:29:56 +00:00
raspberrypi-kernel: Updated to latest version as of 20130826 (rev 7849605f5a)
2013-08-27 11:05:13 +01:00
let
linux_rpi: 1.20180919 -> 1.20190215
2019-03-21 02:51:08 +00:00
modDirVersion = "4.14.98";
tag = "1.20190215";
linux-rpi: 4.1.20-XXX -> 4.4.13-1.20160620-1 - Add a patch to unset CONFIG_LOCALVERSION in the v7 build. - Copy all the device trees to match the upstream names so U-Boot can find them. (This is a hack.)
2016-07-03 23:50:37 +01:00
in
linux_rpi: Extend the logic for not installing unnecessary DTBs Now ARMv6 and ARMv7 builds avoid installing DTBs for boards where the resulting kernel won't run just like the aarch64 builds already do. Also deduplicates the logic a bit.
2018-09-20 14:41:04 +01:00
lib.overrideDerivation (buildLinux (args // rec {
linux-rpi: 4.1.20-XXX -> 4.4.13-1.20160620-1 - Add a patch to unset CONFIG_LOCALVERSION in the v7 build. - Copy all the device trees to match the upstream names so U-Boot can find them. (This is a hack.)
2016-07-03 23:50:37 +01:00
version = "${modDirVersion}-${tag}";
inherit modDirVersion;
Update the raspberry pi kernel to one newer.
2013-01-28 23:42:36 +00:00
linux-rpi: 4.1.20-XXX -> 4.4.13-1.20160620-1 - Add a patch to unset CONFIG_LOCALVERSION in the v7 build. - Copy all the device trees to match the upstream names so U-Boot can find them. (This is a hack.)
2016-07-03 23:50:37 +01:00
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "linux";
raspberrypifw, linux_rpi: 1.20161020 -> 1.20170303
2017-03-03 19:16:31 +00:00
rev = "raspberrypi-kernel_${tag}-1";
linux_rpi: 1.20180919 -> 1.20190215
2019-03-21 02:51:08 +00:00
sha256 = "1gc4x7p82m2v1jhahhyl7qfdkflj71ly6p0fpc1vf9sk13hbwgj2";
Unify the Linux kernel configurations Having N different copies of the NixOS kernel configuration is bad because these copies tend to diverge. For instance, our 3.10 config lacked some modules that were enabled in older configs, probably because the 3.10 config had been copied off an earlier version of some older kernel config. So now there is a single kernel config in common-config.nix. It has a few conditionals to deal with new/removed kernel options, but otherwise it's pretty straightforward. Also, a lot of cut&paste boilerplate between the kernel Nix expressions is gone (such as preConfigure).
2013-07-31 22:56:48 +01:00
};
Adding linux-3.6-rpi I picked the change from https://github.com/aforemny/nixpkgs/commit/7b4d69eeff2eb10c395c8d1a52a0c1e246cddb45
2012-12-27 21:29:56 +00:00
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.
2017-11-03 13:50:19 +00:00
defconfig = {
"armv6l-linux" = "bcmrpi_defconfig";
"armv7l-linux" = "bcm2709_defconfig";
linux_rpi: add support for Raspberry Pi 3
2018-09-10 05:15:51 +01:00
"aarch64-linux" = "bcmrpi3_defconfig";
reewide: Purge all uses `stdenv.system` and top-level `system` It is deprecated and will be removed after 18.09.
2018-08-20 20:11:29 +01:00
}.${stdenv.hostPlatform.system} or (throw "linux_rpi not supported on '${stdenv.hostPlatform.system}'");
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.
2017-11-03 13:50:19 +00:00
linuxPackages: properly propagate `features` and `extraConfig` `kernel.override { features = ... }` didn't work before, now it works as expected.
2017-09-15 22:07:14 +01:00
features = {
efiBootStub = false;
} // (args.features or {});
Adding linux-3.6-rpi I picked the change from https://github.com/aforemny/nixpkgs/commit/7b4d69eeff2eb10c395c8d1a52a0c1e246cddb45
2012-12-27 21:29:56 +00:00
linux-rpi: set correct hydraPlatforms (#53325)
2019-01-03 21:42:14 +00:00
extraMeta.hydraPlatforms = [ "aarch64-linux" ];
linux_rpi: allow modDirVersion override
2019-01-11 01:54:35 +00:00
} // (args.argsOverride or {}))) (oldAttrs: {
linux-rpi: 4.1.20-XXX -> 4.4.13-1.20160620-1 - Add a patch to unset CONFIG_LOCALVERSION in the v7 build. - Copy all the device trees to match the upstream names so U-Boot can find them. (This is a hack.)
2016-07-03 23:50:37 +01:00
postConfigure = ''
# The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
'';
linux_rpi: add support for Raspberry Pi 3
2018-09-10 05:15:51 +01:00
# Make copies of the DTBs named after the upstream names so that U-Boot finds them.
# This is ugly as heck, but I don't know a better solution so far.
linux_rpi: Extend the logic for not installing unnecessary DTBs Now ARMv6 and ARMv7 builds avoid installing DTBs for boards where the resulting kernel won't run just like the aarch64 builds already do. Also deduplicates the logic a bit.
2018-09-20 14:41:04 +01:00
postFixup = ''
dtbDir=${if stdenv.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"}
rm $dtbDir/bcm283*.dtb
linux_rpi: add support for Raspberry Pi 3
2018-09-10 05:15:51 +01:00
copyDTB() {
linux_rpi: Extend the logic for not installing unnecessary DTBs Now ARMv6 and ARMv7 builds avoid installing DTBs for boards where the resulting kernel won't run just like the aarch64 builds already do. Also deduplicates the logic a bit.
2018-09-20 14:41:04 +01:00
cp -v "$dtbDir/$1" "$dtbDir/$2"
linux_rpi: add support for Raspberry Pi 3
2018-09-10 05:15:51 +01:00
}
linux_rpi: Extend the logic for not installing unnecessary DTBs Now ARMv6 and ARMv7 builds avoid installing DTBs for boards where the resulting kernel won't run just like the aarch64 builds already do. Also deduplicates the logic a bit.
2018-09-20 14:41:04 +01:00
'' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv6l-linux"]) ''
linux_rpi: More downstream device tree name fixups Also remove the upstream device trees beforehand so we don't accidentally end using them if we mess up in postFixup. Also on the topic of mess ups, make the copy unconditional since they always seem to be built on all architectures anyway so checking for their existence just hides typos.
2018-05-07 19:59:15 +01:00
copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero-w.dtb
linux-rpi: 4.1.20-XXX -> 4.4.13-1.20160620-1 - Add a patch to unset CONFIG_LOCALVERSION in the v7 build. - Copy all the device trees to match the upstream names so U-Boot can find them. (This is a hack.)
2016-07-03 23:50:37 +01:00
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb
copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-a-plus.dtb
copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-b-plus.dtb
copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb
linux_rpi: Extend the logic for not installing unnecessary DTBs Now ARMv6 and ARMv7 builds avoid installing DTBs for boards where the resulting kernel won't run just like the aarch64 builds already do. Also deduplicates the logic a bit.
2018-09-20 14:41:04 +01:00
'' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux"]) ''
linux-rpi: 4.1.20-XXX -> 4.4.13-1.20160620-1 - Add a patch to unset CONFIG_LOCALVERSION in the v7 build. - Copy all the device trees to match the upstream names so U-Boot can find them. (This is a hack.)
2016-07-03 23:50:37 +01:00
copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
linux_rpi: Extend the logic for not installing unnecessary DTBs Now ARMv6 and ARMv7 builds avoid installing DTBs for boards where the resulting kernel won't run just like the aarch64 builds already do. Also deduplicates the logic a bit.
2018-09-20 14:41:04 +01:00
'' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) ''
linux-rpi: 4.1.20-XXX -> 4.4.13-1.20160620-1 - Add a patch to unset CONFIG_LOCALVERSION in the v7 build. - Copy all the device trees to match the upstream names so U-Boot can find them. (This is a hack.)
2016-07-03 23:50:37 +01:00
copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
linux_rpi: More downstream device tree name fixups Also remove the upstream device trees beforehand so we don't accidentally end using them if we mess up in postFixup. Also on the topic of mess ups, make the copy unconditional since they always seem to be built on all architectures anyway so checking for their existence just hides typos.
2018-05-07 19:59:15 +01:00
copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
linux-rpi: 4.1.20-XXX -> 4.4.13-1.20160620-1 - Add a patch to unset CONFIG_LOCALVERSION in the v7 build. - Copy all the device trees to match the upstream names so U-Boot can find them. (This is a hack.)
2016-07-03 23:50:37 +01:00
'';
Unify the Linux kernel configurations Having N different copies of the NixOS kernel configuration is bad because these copies tend to diverge. For instance, our 3.10 config lacked some modules that were enabled in older configs, probably because the 3.10 config had been copied off an earlier version of some older kernel config. So now there is a single kernel config in common-config.nix. It has a few conditionals to deal with new/removed kernel options, but otherwise it's pretty straightforward. Also, a lot of cut&paste boilerplate between the kernel Nix expressions is gone (such as preConfigure).
2013-07-31 22:56:48 +01:00
})
Reference in New Issue Copy Permalink