about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-09-15 23:15:16 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-09-15 23:15:16 +0300
commitc8e7aab0c8bae8a49ec5bd87ace65b237c8e3d18 (patch)
treed8a5243d93d6bad84f197308fe0ba97621876e2f /nixos
parentb19fa00e3edd49442a838e4979b88d4d9e99af00 (diff)
downloadnixlib-c8e7aab0c8bae8a49ec5bd87ace65b237c8e3d18.tar
nixlib-c8e7aab0c8bae8a49ec5bd87ace65b237c8e3d18.tar.gz
nixlib-c8e7aab0c8bae8a49ec5bd87ace65b237c8e3d18.tar.bz2
nixlib-c8e7aab0c8bae8a49ec5bd87ace65b237c8e3d18.tar.lz
nixlib-c8e7aab0c8bae8a49ec5bd87ace65b237c8e3d18.tar.xz
nixlib-c8e7aab0c8bae8a49ec5bd87ace65b237c8e3d18.tar.zst
nixlib-c8e7aab0c8bae8a49ec5bd87ace65b237c8e3d18.zip
sd-image-aarch64: Increase CMA memory so RPi3 virtual console works again
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/installer/cd-dvd/sd-image-aarch64.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index 063ffb191ee6..8d80ceff84e0 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -27,7 +27,8 @@ in
   boot.loader.generic-extlinux-compatible.enable = true;
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelParams = ["console=ttyS0,115200n8" "console=tty0"];
+  # Increase the amount of CMA to ensure the virtual console on the RPi3 works.
+  boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=tty0"];
   boot.consoleLogLevel = 7;
 
   # FIXME: this probably should be in installation-device.nix