diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2021-05-03 23:45:26 -0400 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2021-05-04 19:42:13 -0400 |
| commit | 1cb977c8588c9aa1bf30fe7fa154b5fcc763471f (patch) | |
| tree | 2ae049fde908739eb98495421e5997072fb3f000 /nixos | |
| parent | cb9b46a3cdcbb4c82c582441f213259ce5399b15 (diff) | |
| download | nixlib-1cb977c8588c9aa1bf30fe7fa154b5fcc763471f.tar nixlib-1cb977c8588c9aa1bf30fe7fa154b5fcc763471f.tar.gz nixlib-1cb977c8588c9aa1bf30fe7fa154b5fcc763471f.tar.bz2 nixlib-1cb977c8588c9aa1bf30fe7fa154b5fcc763471f.tar.lz nixlib-1cb977c8588c9aa1bf30fe7fa154b5fcc763471f.tar.xz nixlib-1cb977c8588c9aa1bf30fe7fa154b5fcc763471f.tar.zst nixlib-1cb977c8588c9aa1bf30fe7fa154b5fcc763471f.zip | |
sd-image: Rely on profiles/all-hardware.nix
This ensures that SD images and UEFI installers don't drift in compatibility with regards to early initrd.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/sd-card/sd-image-aarch64.nix | 7 | ||||
| -rw-r--r-- | nixos/modules/installer/sd-card/sd-image.nix | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64.nix b/nixos/modules/installer/sd-card/sd-image-aarch64.nix index 96ebb7537da3..165e2aac27b4 100644 --- a/nixos/modules/installer/sd-card/sd-image-aarch64.nix +++ b/nixos/modules/installer/sd-card/sd-image-aarch64.nix @@ -18,13 +18,6 @@ # - ttyAMA0: for QEMU's -machine virt boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; - boot.initrd.availableKernelModules = [ - # Allows early (earlier) modesetting for the Raspberry Pi - "vc4" "bcm2835_dma" "i2c_bcm2835" - # Allows early (earlier) modesetting for Allwinner SoCs - "sun4i_drm" "sun8i_drm_hdmi" "sun8i_mixer" - ]; - sdImage = { populateFirmwareCommands = let configTxt = pkgs.writeText "config.txt" '' diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix index 45c8c67169b8..d0fe79903d34 100644 --- a/nixos/modules/installer/sd-card/sd-image.nix +++ b/nixos/modules/installer/sd-card/sd-image.nix @@ -29,6 +29,7 @@ in imports = [ (mkRemovedOptionModule [ "sdImage" "bootPartitionID" ] "The FAT partition for SD image now only holds the Raspberry Pi firmware files. Use firmwarePartitionID to configure that partition's ID.") (mkRemovedOptionModule [ "sdImage" "bootSize" ] "The boot files for SD image have been moved to the main ext4 partition. The FAT partition now only holds the Raspberry Pi firmware files. Changing its size may not be required.") + ../../profiles/all-hardware.nix ]; options.sdImage = { |