diff options
| author | Alistair Delva <adelva@google.com> | 2021-11-03 11:52:03 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2021-11-03 11:55:31 -0700 |
| commit | d1b0c9ade73d52655a6462a72d8213e931b3a710 (patch) | |
| tree | 637f6861d0077f22111fe54e8aad2da62c77a845 | |
| parent | ac1e689916d13a8adae1c5655edb6e067855dc86 (diff) | |
| download | tests-d1b0c9ade73d52655a6462a72d8213e931b3a710.tar.gz | |
build_rootfs.sh: Fix console output with VT enabled
If the kernel image being used for bootstrap has CONFIG_VT enabled, then
the kernel won't prefer the serial console devices and will output to
ttyX instead, which goes nowhere. Force it to output to the configured
QEMU serial ports.
Change-Id: Ie7a1a1679702680fce61708ba6dcb077b2c00dc1
| -rwxr-xr-x | net/test/build_rootfs.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/test/build_rootfs.sh b/net/test/build_rootfs.sh index 94ccd14..994985e 100755 --- a/net/test/build_rootfs.sh +++ b/net/test/build_rootfs.sh @@ -98,25 +98,25 @@ fi case "${arch}" in i386) - cmdline="${cmdline} exitcode=/dev/ttyS1" + cmdline="${cmdline} console=ttyS0 exitcode=/dev/ttyS1" machine="pc-i440fx-2.8,accel=kvm" qemu="qemu-system-i386" cpu="max" ;; amd64) - cmdline="${cmdline} exitcode=/dev/ttyS1" + cmdline="${cmdline} console=ttyS0 exitcode=/dev/ttyS1" machine="pc-i440fx-2.8,accel=kvm" qemu="qemu-system-x86_64" cpu="max" ;; armhf) - cmdline="${cmdline} exitcode=/dev/ttyS0" + cmdline="${cmdline} console=ttyAMA0 exitcode=/dev/ttyS0" machine="virt,gic-version=2" qemu="qemu-system-arm" cpu="cortex-a15" ;; arm64) - cmdline="${cmdline} exitcode=/dev/ttyS0" + cmdline="${cmdline} console=ttyAMA0 exitcode=/dev/ttyS0" machine="virt,gic-version=2" qemu="qemu-system-aarch64" cpu="cortex-a53" # "max" is too slow |