summary refs log tree commit diff
path: root/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2017-02-11 12:23:16 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2017-02-11 12:23:16 +0200
commit607be4d88e9f9287a16e0b3c7836c4618320ebc5 (patch)
tree445b4a43e8c3e7d6f1f6fc603c273c9bd73dce5b /nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
parent003a0609eed64a18579db06155fe86c83739a6e6 (diff)
downloadnixpkgs-607be4d88e9f9287a16e0b3c7836c4618320ebc5.tar
nixpkgs-607be4d88e9f9287a16e0b3c7836c4618320ebc5.tar.gz
nixpkgs-607be4d88e9f9287a16e0b3c7836c4618320ebc5.tar.bz2
nixpkgs-607be4d88e9f9287a16e0b3c7836c4618320ebc5.tar.lz
nixpkgs-607be4d88e9f9287a16e0b3c7836c4618320ebc5.tar.xz
nixpkgs-607be4d88e9f9287a16e0b3c7836c4618320ebc5.tar.zst
nixpkgs-607be4d88e9f9287a16e0b3c7836c4618320ebc5.zip
sd-image-*: Copy all RPi firmware files
Turns out all variants of start.elf and fixup.dat are needed (depending
on what's in config.txt). I was under the mistaken impression that you
were supposed to rename one of the variants to switch using them, but
nope.
Diffstat (limited to 'nixos/modules/installer/cd-dvd/sd-image-aarch64.nix')
-rw-r--r--nixos/modules/installer/cd-dvd/sd-image-aarch64.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index 8cf349fbd07..c769bc80a48 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -52,9 +52,7 @@ in
         enable_uart=1
       '';
       in ''
-        for f in bootcode.bin fixup.dat start.elf; do
-          cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/
-        done
+        (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
         cp ${patchedUboot}/u-boot.bin boot/u-boot-rpi3.bin
         cp ${configTxt} boot/config.txt
         ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot