diff --git a/devices/qemu-aarch64/default.nix b/devices/qemu-aarch64/default.nix index c1144aa..6abab3d 100644 --- 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 index 460c03e..e1e9702 100644 --- 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" - ]; }; }