diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2020-09-12 22:48:05 -0400 |
---|---|---|
committer | Milan <me@pbb.lc> | 2020-12-31 18:20:49 +0100 |
commit | f9d5de05d255dca286d12a6630a97a2b81dcaea7 (patch) | |
tree | 05af9d3212cc629dfda0d89e8e0a3819db9a817b /nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix | |
parent | 95cd8c8d7be15606a0ec418dc313726ff170d9ee (diff) | |
download | nixpkgs-f9d5de05d255dca286d12a6630a97a2b81dcaea7.tar nixpkgs-f9d5de05d255dca286d12a6630a97a2b81dcaea7.tar.gz nixpkgs-f9d5de05d255dca286d12a6630a97a2b81dcaea7.tar.bz2 nixpkgs-f9d5de05d255dca286d12a6630a97a2b81dcaea7.tar.lz nixpkgs-f9d5de05d255dca286d12a6630a97a2b81dcaea7.tar.xz nixpkgs-f9d5de05d255dca286d12a6630a97a2b81dcaea7.tar.zst nixpkgs-f9d5de05d255dca286d12a6630a97a2b81dcaea7.zip |
sd-image-raspberrypi4: Use u-boot for booting
This includes setting up everything for the mainline Raspberry Pi 4 image. In fact, the only difference left in the Raspberry Pi 4-specific image is the kernel from the vendor.
Diffstat (limited to 'nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix')
-rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix index 87545e84203..5bdec7de86e 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix @@ -3,36 +3,6 @@ { config, lib, pkgs, ... }: { - imports = [ - ../../profiles/base.nix - ../../profiles/installation-device.nix - ./sd-image.nix - ]; - - boot.loader.grub.enable = false; - boot.loader.raspberryPi.enable = true; - boot.loader.raspberryPi.version = 4; + imports = [ ./sd-image-aarch64.nix ]; boot.kernelPackages = pkgs.linuxPackages_rpi4; - - boot.consoleLogLevel = lib.mkDefault 7; - - sdImage = { - firmwareSize = 128; - firmwarePartitionName = "NIXOS_BOOT"; - # This is a hack to avoid replicating config.txt from boot.loader.raspberryPi - populateFirmwareCommands = - "${config.system.build.installBootLoader} ${config.system.build.toplevel} -d ./firmware"; - # As the boot process is done entirely in the firmware partition. - populateRootCommands = ""; - }; - - fileSystems."/boot/firmware" = { - # This effectively "renames" the attrsOf entry set in sd-image.nix - mountPoint = "/boot"; - neededForBoot = true; - }; - - # the installation media is also the installation target, - # so we don't want to provide the installation configuration.nix. - installer.cloneConfig = false; } |