diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-06-01 18:03:44 -0400 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-06-16 17:47:30 -0400 |
| commit | 6e9e78b61869bcec02055a0210e8ac569be9f881 (patch) | |
| tree | 853d196aec04f7b8dee440847aff4ffe9fa59f30 /nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | |
| parent | 7815c86c104a99417db844791dcda34fe7a7965f (diff) | |
| download | nixpkgs-6e9e78b61869bcec02055a0210e8ac569be9f881.tar nixpkgs-6e9e78b61869bcec02055a0210e8ac569be9f881.tar.gz nixpkgs-6e9e78b61869bcec02055a0210e8ac569be9f881.tar.bz2 nixpkgs-6e9e78b61869bcec02055a0210e8ac569be9f881.tar.lz nixpkgs-6e9e78b61869bcec02055a0210e8ac569be9f881.tar.xz nixpkgs-6e9e78b61869bcec02055a0210e8ac569be9f881.tar.zst nixpkgs-6e9e78b61869bcec02055a0210e8ac569be9f881.zip | |
sd-image: Moves `/boot` into rootfs
The current FAT32 partition is kept as it is required for the Raspberry Pi family of hardware. It is where the firmware is kept. The partition is kept bootable, and the boot files kept in there until the following commits, to keep all commits of this series individually bootable.
Diffstat (limited to 'nixos/modules/installer/cd-dvd/sd-image-aarch64.nix')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 5f7194e92a3..eb0bc9da409 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -27,7 +27,7 @@ in boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; sdImage = { - populateBootCommands = let + populateFirmwareCommands = let configTxt = pkgs.writeText "config.txt" '' kernel=u-boot-rpi3.bin @@ -43,10 +43,10 @@ in avoid_warnings=1 ''; in '' - (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/) - 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 + (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/) + cp ${pkgs.ubootRaspberryPi3_64bit}/u-boot.bin firmware/u-boot-rpi3.bin + cp ${configTxt} firmware/config.txt + ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./firmware ''; }; } |