dan
/
liminix
1
0
Fork 5
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

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

armv7
Daniel Barlow 2023-10-07 22:49:45 +01:00
parent 528d619d76
commit dbc16edf96
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devices/qemu-aarch64/default.nix
View File

@ -42,6 +42,9 @@
SERIAL_AMBA_PL011_CONSOLE = "y"; SERIAL_AMBA_PL011_CONSOLE = "y";
}; };
}; };
boot.commandLine = [
"console=ttyAMA0,38400"
];
hardware = hardware =
let let
mac80211 = pkgs.mac80211.override { mac80211 = pkgs.mac80211.override {

5
modules/arch/aarch64.nix
View File

@ -6,14 +6,11 @@
CPU_BIG_ENDIAN= "n"; CPU_BIG_ENDIAN= "n";
# CMDLINE_FROM_BOOTLOADER availability is conditional # CMDLINE_FROM_BOOTLOADER availability is conditional
# on CMDLINE being set to something non-empty # on CMDLINE being set to something non-empty
CMDLINE="\"console=ttyAMA0\""; CMDLINE="\"empty=false\"";
CMDLINE_FROM_BOOTLOADER = "y"; CMDLINE_FROM_BOOTLOADER = "y";
OF = "y"; OF = "y";
# USE_OF = "y"; # USE_OF = "y";
}; };
boot.commandLine = [
"console=ttyAMA0,38400"
];
}; };
} }