summary refs log tree commit diff
path: root/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-01-24 16:43:16 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-01-24 18:23:31 +0200
commitcd2e740dde9541ad5f1d9efd93bcb5a967379ece (patch)
treee00b43c8fdd235abb88b99627c90d4e196b9009d /nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
parentf7dd6951aaa26087c8fd9f01bbe21f7c1254117b (diff)
downloadnixpkgs-cd2e740dde9541ad5f1d9efd93bcb5a967379ece.tar
nixpkgs-cd2e740dde9541ad5f1d9efd93bcb5a967379ece.tar.gz
nixpkgs-cd2e740dde9541ad5f1d9efd93bcb5a967379ece.tar.bz2
nixpkgs-cd2e740dde9541ad5f1d9efd93bcb5a967379ece.tar.lz
nixpkgs-cd2e740dde9541ad5f1d9efd93bcb5a967379ece.tar.xz
nixpkgs-cd2e740dde9541ad5f1d9efd93bcb5a967379ece.tar.zst
nixpkgs-cd2e740dde9541ad5f1d9efd93bcb5a967379ece.zip
nixos/sd-image-aarch64.nix: Set avoid_warnings in RPi config.txt
Also add some comments on the existing config settings as well.
Diffstat (limited to 'nixos/modules/installer/cd-dvd/sd-image-aarch64.nix')
-rw-r--r--nixos/modules/installer/cd-dvd/sd-image-aarch64.nix9
1 files changed, 9 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 efb9ba39bcd..bc6dfb25e86 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -42,8 +42,17 @@ in
     populateBootCommands = let
       configTxt = pkgs.writeText "config.txt" ''
         kernel=u-boot-rpi3.bin
+
+        # Boot in 64-bit mode.
         arm_control=0x200
+
+        # U-Boot used to need this to work, regardless of whether UART is actually used or not.
+        # TODO: check when/if this can be removed.
         enable_uart=1
+
+        # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel
+        # when attempting to show low-voltage or overtemperature warnings.
+        avoid_warnings=1
       '';
       in ''
         (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)