diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-04-26 15:25:56 -0700 |
|---|---|---|
| committer | Bernardo Meurer <bernardo@meurer.org> | 2022-04-26 19:05:23 -0700 |
| commit | b30105b7c28b6510980101e8266b2268b1e2313f (patch) | |
| tree | 48943a9b9093b59a6984c892f4e27b32a79742aa /nixos/modules/installer | |
| parent | aca45f8c678deaa35dc407586e91d302d36dc74d (diff) | |
| download | nixlib-b30105b7c28b6510980101e8266b2268b1e2313f.tar nixlib-b30105b7c28b6510980101e8266b2268b1e2313f.tar.gz nixlib-b30105b7c28b6510980101e8266b2268b1e2313f.tar.bz2 nixlib-b30105b7c28b6510980101e8266b2268b1e2313f.tar.lz nixlib-b30105b7c28b6510980101e8266b2268b1e2313f.tar.xz nixlib-b30105b7c28b6510980101e8266b2268b1e2313f.tar.zst nixlib-b30105b7c28b6510980101e8266b2268b1e2313f.zip | |
ubootRaspberryCM4_64bit: merge with ubootRaspberryPi4_64bit
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/sd-card/sd-image-aarch64.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64.nix b/nixos/modules/installer/sd-card/sd-image-aarch64.nix index 1aca8c7e8ecf..7825a47814c3 100644 --- a/nixos/modules/installer/sd-card/sd-image-aarch64.nix +++ b/nixos/modules/installer/sd-card/sd-image-aarch64.nix @@ -40,7 +40,7 @@ arm_boost=1 [cm4] - kernel=u-boot-rpi-cm4.bin + kernel=u-boot-rpi4.bin enable_gic=1 armstub=armstub8-gic.bin disable_overscan=1 @@ -76,9 +76,6 @@ cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/ - - # Add cm4 specific files - cp ${pkgs.ubootRaspberryPiCM4_64bit}/u-boot.bin firmware/u-boot-rpi-cm4.bin cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4.dtb firmware/ ''; populateRootCommands = '' |