summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2019-06-10 21:33:28 -0400
committerSamuel Dionne-Riel <samuel@dionne-riel.com>2019-06-15 14:26:20 -0400
commit390f2071df6f846f0e5ce488c3caeb03cdd43260 (patch)
tree1418ad78e848a32a3e2f8a63acfc1bcd4e1cd87b /nixos
parentadc62907a68081e4786e31c0725ca5de04afd77b (diff)
downloadnixpkgs-390f2071df6f846f0e5ce488c3caeb03cdd43260.tar
nixpkgs-390f2071df6f846f0e5ce488c3caeb03cdd43260.tar.gz
nixpkgs-390f2071df6f846f0e5ce488c3caeb03cdd43260.tar.bz2
nixpkgs-390f2071df6f846f0e5ce488c3caeb03cdd43260.tar.lz
nixpkgs-390f2071df6f846f0e5ce488c3caeb03cdd43260.tar.xz
nixpkgs-390f2071df6f846f0e5ce488c3caeb03cdd43260.tar.zst
nixpkgs-390f2071df6f846f0e5ce488c3caeb03cdd43260.zip
sd-image-aarch64: Allows early modesetting for the Raspberry Pi
This will reduce the confusion at boot, where the only thing visible is
the last message from u-boot; where it looks like the Raspberry Pi is
hung, while in reality it's likely resizing partitions.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/installer/cd-dvd/sd-image-aarch64.nix5
1 files changed, 5 insertions, 0 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..9930a4ff304 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -26,6 +26,11 @@ in
   # Also increase the amount of CMA to ensure the virtual console on the RPi3 works.
   boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"];
 
+  boot.initrd.availableKernelModules = [
+    # Allows early (earlier) modesetting for the Raspberry Pi
+    "vc4" "bcm2835_dma" "i2c_bcm2835"
+  ];
+
   sdImage = {
     populateBootCommands = let
       configTxt = pkgs.writeText "config.txt" ''