From 390f2071df6f846f0e5ce488c3caeb03cdd43260 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 10 Jun 2019 21:33:28 -0400 Subject: [PATCH] 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. --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 5f7194e92a36..9930a4ff3047 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" ''