diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-08 11:56:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-08 11:56:52 +0200 |
| commit | a0c34f54cc61dc20ae1ec91766b9efad102f5b36 (patch) | |
| tree | 96aeb2b4fb3aeff9ecc8c52d173c3b8d57a0ce59 /pkgs/os-specific/linux/kernel/linux-rpi.nix | |
| parent | 0913e30c859f0071d0f0529c309d4256713acc41 (diff) | |
| parent | 60b2fe660e2bcb605650173b7b0a59a47bc6a7e5 (diff) | |
| download | nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.gz nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.bz2 nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.lz nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.xz nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.zst nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-rpi.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-rpi.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index b383abdef1dc..f8ad6b37a190 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -49,8 +49,8 @@ lib.overrideDerivation (buildLinux (args // { cp -v "$dtbDir/$1" "$dtbDir/$2" } '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv6l-linux"]) '' - copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero.dtb - copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero-w.dtb + copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero.dtb + copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero-w.dtb 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 |