summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Delva <adelva@google.com>2022-03-02 21:00:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-02 21:00:56 +0000
commitfff2204abd9c406b15189b14ce19658015a490b7 (patch)
tree17f8849a6de827449e1c5f4b62caf67bec3424aa
parentfa13e575d13f51ec9bf4ea8ec241f3d4b1c24fa5 (diff)
parentc1da693bb2cde7fb1be33121b240c570db043542 (diff)
downloadtests-fff2204abd9c406b15189b14ce19658015a490b7.tar.gz
build_rootfs.sh: Add 8250.nr_uarts=X am: db23c1a5bd am: 35af13dacb am: 4d420ce6c2 am: c1da693bb2
Original change: https://android-review.googlesource.com/c/kernel/tests/+/2004333 Change-Id: I2ecf14ef235b04dc8c558f403b7705a03a9eb6e6
-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