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

linux_rpi: More downstream device tree name fixups

Browse Source 
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.
This commit is contained in:
Tuomas Tynkkynen 2018-05-07 21:59:15 +03:00 committed by Tuomas Tynkkynen
parent f49906d80c
commit a8c898be60
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,16 +32,15 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
'';
postFixup = ''
# Make copies of the DTBs so that U-Boot finds them, as it is looking for the upstream names.
# This is ugly as heck.
# 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.
rm $out/dtbs/bcm283*.dtb
copyDTB() {
if [ -f "$out/dtbs/$1" ]; then
cp -v "$out/dtbs/$1" "$out/dtbs/$2"
fi
cp -v "$out/dtbs/$1" "$out/dtbs/$2"
}
# I am not sure if all of these are correct...
copyDTB bcm2708-rpi-0-w.dts bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-0-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
@ -51,6 +50,7 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb
copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
# bcm2710-rpi-cm3.dts is yet unknown.
copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
'';
})