diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-07 01:56:59 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-11-18 13:57:17 +0200 |
| commit | 931aa5f9e2fc73a95f6145bf5237e68dfc56d36b (patch) | |
| tree | 5bc939a831b69af5de785f6f1fc3d539a8da2a49 /nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | |
| parent | bd47e1723484e88cfa710d81bf72ee508278822d (diff) | |
| download | nixlib-931aa5f9e2fc73a95f6145bf5237e68dfc56d36b.tar nixlib-931aa5f9e2fc73a95f6145bf5237e68dfc56d36b.tar.gz nixlib-931aa5f9e2fc73a95f6145bf5237e68dfc56d36b.tar.bz2 nixlib-931aa5f9e2fc73a95f6145bf5237e68dfc56d36b.tar.lz nixlib-931aa5f9e2fc73a95f6145bf5237e68dfc56d36b.tar.xz nixlib-931aa5f9e2fc73a95f6145bf5237e68dfc56d36b.tar.zst nixlib-931aa5f9e2fc73a95f6145bf5237e68dfc56d36b.zip | |
U-Boot: 2017.03 -> 2017.11
Also move patches from sd-image-aarch64.nix, they might be useful for the older raspberries as well.
Diffstat (limited to 'nixos/modules/installer/cd-dvd/sd-image-aarch64.nix')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index c94dc7d40194..efb9ba39bcd4 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -40,16 +40,6 @@ in sdImage = { populateBootCommands = let - # Contains a couple of fixes for booting a Linux kernel, will hopefully appear upstream soon. - patchedUboot = pkgs.ubootRaspberryPi3_64bit.overrideAttrs (oldAttrs: { - src = pkgs.fetchFromGitHub { - owner = "dezgeg"; - repo = "u-boot"; - rev = "baab53ec244fe44def01948a0f10e67342d401e6"; - sha256 = "0r5j2pc42ws3w3im0a9c6bh01czz5kapqrqp0ik9ra823cw73lxr"; - }; - }); - configTxt = pkgs.writeText "config.txt" '' kernel=u-boot-rpi3.bin arm_control=0x200 @@ -57,7 +47,7 @@ in ''; in '' (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 ${pkgs.ubootRaspberryPi3_64bit}/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 ''; |