summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Delva <adelva@google.com>2021-11-03 21:53:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-03 21:53:21 +0000
commit1ed16d5ff050227db7d2d5855c46f6dcb27ccffa (patch)
tree637f6861d0077f22111fe54e8aad2da62c77a845
parente6236d439059d078781fee79d9430ad3640b0dfc (diff)
parentd1b0c9ade73d52655a6462a72d8213e931b3a710 (diff)
downloadtests-1ed16d5ff050227db7d2d5855c46f6dcb27ccffa.tar.gz
build_rootfs.sh: Fix console output with VT enabled am: d1b0c9ade7
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1880155 Change-Id: I3d3ed3dab87137c3c227b32956f335e1d2c9fa00
-rwxr-xr-xnet/test/build_rootfs.sh8
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