summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Delva <adelva@google.com>2022-03-01 13:54:11 -0800
committerAlistair Delva <adelva@google.com>2022-03-01 14:09:08 -0800
commitdb23c1a5bd6d0f69e0d66435f1adf9b6f50e4fd8 (patch)
tree17f8849a6de827449e1c5f4b62caf67bec3424aa
parenta8cd1e6b0763566da9c77453d77cdf1bd4cb4273 (diff)
downloadtests-db23c1a5bd6d0f69e0d66435f1adf9b6f50e4fd8.tar.gz
build_rootfs.sh: Add 8250.nr_uarts=X
When bootstrapping with recent GKI images, the 8250 serial devices will not be available to userspace due to a mitigation made for devices without 8250 serial. On devices where these are known to exist, 8250.nr_uarts must be set. Add it to build_rootfs.sh as well. This has no harmful effect on older kernels. Change-Id: I5394774d66e6c2a080b540bad8a31a17b6aa166c
-rwxr-xr-xnet/test/build_rootfs.sh2
-rwxr-xr-xnet/test/rootfs/bullseye-cuttlefish.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/test/build_rootfs.sh b/net/test/build_rootfs.sh
index 994985e..e631fe8 100755
--- a/net/test/build_rootfs.sh
+++ b/net/test/build_rootfs.sh
@@ -89,7 +89,7 @@ while getopts ":hs:a:m:n:r:k:i:d:e" opt; do
done
# Disable Debian's "persistent" network device renaming
-cmdline="net.ifnames=0 rw PATH=/usr/sbin:/usr/bin"
+cmdline="net.ifnames=0 rw 8250.nr_uarts=2 PATH=/usr/sbin:/usr/bin"
# Pass down embedding option, if specified
if [ -n "${embed_kernel_initrd_dtb}" ]; then
diff --git a/net/test/rootfs/bullseye-cuttlefish.sh b/net/test/rootfs/bullseye-cuttlefish.sh
index 0f572bc..0771ac1 100755
--- a/net/test/rootfs/bullseye-cuttlefish.sh
+++ b/net/test/rootfs/bullseye-cuttlefish.sh
@@ -44,7 +44,7 @@ install_and_cleanup_iptables
create_systemd_getty_symlinks ttyS0 hvc1
-setup_grub "net.ifnames=0"
+setup_grub "net.ifnames=0 8250.nr_uarts=1"
apt-get purge -y vim-tiny
bullseye_cleanup