liminix

commit dbc16edf965d9d3dc46e064982566ddfc6b401c2
parent 528d619d76d1c82b8cfbaa0f220694f4ef58e767
Author: Daniel Barlow <dan@telent.net>
Date:   Sat,  7 Oct 2023 22:49:45 +0100

don't use ttyAMA0 console on all aarch64, just qemu

Diffstat:
M
devices/qemu-aarch64/default.nix
 | 
3
+++
M
modules/arch/aarch64.nix
 | 
5
+----

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/devices/qemu-aarch64/default.nix b/devices/qemu-aarch64/default.nix
@@ -42,6 +42,9 @@
         SERIAL_AMBA_PL011_CONSOLE = "y";
       };
     };
+    boot.commandLine = [
+      "console=ttyAMA0,38400"
+    ];
     hardware =
       let
         mac80211 =  pkgs.mac80211.override {
diff --git a/modules/arch/aarch64.nix b/modules/arch/aarch64.nix
@@ -6,14 +6,11 @@
       CPU_BIG_ENDIAN= "n";
       # CMDLINE_FROM_BOOTLOADER availability is conditional
       # on CMDLINE being set to something non-empty
-      CMDLINE="\"console=ttyAMA0\"";
+      CMDLINE="\"empty=false\"";
       CMDLINE_FROM_BOOTLOADER = "y";
 
       OF = "y";
       # USE_OF = "y";
     };
-    boot.commandLine = [
-      "console=ttyAMA0,38400"
-    ];
   };
 }