diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-10-25 20:30:17 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-10-25 22:56:20 +0300 |
| commit | 21f4a5f1b13a79e95a1b7afc9cc8caca831b4721 (patch) | |
| tree | cbbf4917b0b45ea5c2d58797a90787d0d8a338e0 /nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | |
| parent | a3b11bd05688bce1206459affeb3f1e338ecf1d8 (diff) | |
| download | nixpkgs-21f4a5f1b13a79e95a1b7afc9cc8caca831b4721.tar nixpkgs-21f4a5f1b13a79e95a1b7afc9cc8caca831b4721.tar.gz nixpkgs-21f4a5f1b13a79e95a1b7afc9cc8caca831b4721.tar.bz2 nixpkgs-21f4a5f1b13a79e95a1b7afc9cc8caca831b4721.tar.lz nixpkgs-21f4a5f1b13a79e95a1b7afc9cc8caca831b4721.tar.xz nixpkgs-21f4a5f1b13a79e95a1b7afc9cc8caca831b4721.tar.zst nixpkgs-21f4a5f1b13a79e95a1b7afc9cc8caca831b4721.zip | |
sd-image-aarch64.nix: Document serial ports used
Also drop boot.consoleLogLevel which already comes from installation-device.nix
Diffstat (limited to 'nixos/modules/installer/cd-dvd/sd-image-aarch64.nix')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 8d80ceff84e..ec5ac532963 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -27,9 +27,12 @@ in boot.loader.generic-extlinux-compatible.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; - # 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; + + # 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"]; # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; |