diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2020-09-13 23:26:21 -0400 |
|---|---|---|
| committer | Milan <me@pbb.lc> | 2020-12-31 18:20:49 +0100 |
| commit | 4e75a31e98d2219c1deb450fc90ecd98ced83b58 (patch) | |
| tree | 49ba3fdaa55cb59fbbeed905a14d288ff7241ccc /nixos | |
| parent | f9d5de05d255dca286d12a6630a97a2b81dcaea7 (diff) | |
linux: configure aarch64 contiguous memory allocator via kernel config
As per the in-line comment, this is where distros should configure it. Not via kernel command line parameters. As found by looking at the implementation, while exploring the cause of a bug on the Raspberry Pi 4, it was found that `cma=` on the command line parameters will overwrite the values a device tree will have configured for a given platform. With this, the more recent 5.4 vendor kernel boots just fine on the Raspberry Pi 4 using our common configuration.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index e73bc5a22e0b8..e4ec2d6240d02 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -17,8 +17,7 @@ # The serial ports listed here are: # - ttyS0: for Tegra (Jetson TX1) # - ttyAMA0: for QEMU's -machine virt - # 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.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; boot.initrd.availableKernelModules = [ # Allows early (earlier) modesetting for the Raspberry Pi |