diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 06:30:34 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 06:30:34 +0200 |
| commit | a008a9cb3bcde88482ae1d7bb13999b5128275c8 (patch) | |
| tree | fa823d63925ce6c0ee491130e59b187d19a06a01 /nixos/modules/installer | |
| parent | 237ae9a0d176b497d8fd5f7b524c8212d47522ca (diff) | |
| download | nixlib-a008a9cb3bcde88482ae1d7bb13999b5128275c8.tar nixlib-a008a9cb3bcde88482ae1d7bb13999b5128275c8.tar.gz nixlib-a008a9cb3bcde88482ae1d7bb13999b5128275c8.tar.bz2 nixlib-a008a9cb3bcde88482ae1d7bb13999b5128275c8.tar.lz nixlib-a008a9cb3bcde88482ae1d7bb13999b5128275c8.tar.xz nixlib-a008a9cb3bcde88482ae1d7bb13999b5128275c8.tar.zst nixlib-a008a9cb3bcde88482ae1d7bb13999b5128275c8.zip | |
nixos/sd-image-armv7l-multiplatform: Port RPi config.txt changes from aarch64 image
As was done in commit cd2e740dde9541ad5f1d9efd93bcb5a967379ece.
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index f23275bc16d5..08903ba397a1 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -43,11 +43,18 @@ in sdImage = { populateBootCommands = let configTxt = pkgs.writeText "config.txt" '' + # 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 + [pi2] kernel=u-boot-rpi2.bin [pi3] kernel=u-boot-rpi3.bin + + # 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 ''; in '' |