From c8e7aab0c8bae8a49ec5bd87ace65b237c8e3d18 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 15 Sep 2017 23:15:16 +0300 Subject: [PATCH] sd-image-aarch64: Increase CMA memory so RPi3 virtual console works again --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 063ffb191ee..8d80ceff84e 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