diff options
17 files changed, 18 insertions, 16 deletions
diff --git a/dashboard/config/linux/android-5.10-base.config b/dashboard/config/linux/android-5.10-base.config index 5e0e4d1ac..de04d5603 100644 --- a/dashboard/config/linux/android-5.10-base.config +++ b/dashboard/config/linux/android-5.10-base.config @@ -2502,7 +2502,7 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DWLIB=y # CONFIG_SERIAL_8250_DW is not set diff --git a/dashboard/config/linux/android-5.10-cuttlefish-base.config b/dashboard/config/linux/android-5.10-cuttlefish-base.config index e1398b01d..86a72d0ff 100644 --- a/dashboard/config/linux/android-5.10-cuttlefish-base.config +++ b/dashboard/config/linux/android-5.10-cuttlefish-base.config @@ -2497,7 +2497,7 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DWLIB=y # CONFIG_SERIAL_8250_DW is not set diff --git a/dashboard/config/linux/android-5.10-cuttlefish.config b/dashboard/config/linux/android-5.10-cuttlefish.config index 6fce69907..3ff076aff 100644 --- a/dashboard/config/linux/android-5.10-cuttlefish.config +++ b/dashboard/config/linux/android-5.10-cuttlefish.config @@ -2651,7 +2651,7 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DWLIB=y # CONFIG_SERIAL_8250_DW is not set diff --git a/dashboard/config/linux/android-5.10.config b/dashboard/config/linux/android-5.10.config index 29b459047..0b84156d9 100644 --- a/dashboard/config/linux/android-5.10.config +++ b/dashboard/config/linux/android-5.10.config @@ -2738,7 +2738,7 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DWLIB=y # CONFIG_SERIAL_8250_DW is not set diff --git a/dashboard/config/linux/android-5.15-base.config b/dashboard/config/linux/android-5.15-base.config index fd294d6c1..cea391ade 100644 --- a/dashboard/config/linux/android-5.15-base.config +++ b/dashboard/config/linux/android-5.15-base.config @@ -2547,7 +2547,7 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DWLIB=y # CONFIG_SERIAL_8250_DW is not set diff --git a/dashboard/config/linux/android-5.15-cuttlefish-base.config b/dashboard/config/linux/android-5.15-cuttlefish-base.config index b7f032517..8545c54ba 100644 --- a/dashboard/config/linux/android-5.15-cuttlefish-base.config +++ b/dashboard/config/linux/android-5.15-cuttlefish-base.config @@ -2542,7 +2542,7 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DWLIB=y # CONFIG_SERIAL_8250_DW is not set diff --git a/dashboard/config/linux/android-5.15-cuttlefish.config b/dashboard/config/linux/android-5.15-cuttlefish.config index 95e41b630..7066c830f 100644 --- a/dashboard/config/linux/android-5.15-cuttlefish.config +++ b/dashboard/config/linux/android-5.15-cuttlefish.config @@ -2678,7 +2678,7 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DWLIB=y # CONFIG_SERIAL_8250_DW is not set diff --git a/dashboard/config/linux/android-5.15.config b/dashboard/config/linux/android-5.15.config index 741f9e2d4..8cc874ca6 100644 --- a/dashboard/config/linux/android-5.15.config +++ b/dashboard/config/linux/android-5.15.config @@ -2786,7 +2786,7 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DWLIB=y # CONFIG_SERIAL_8250_DW is not set diff --git a/dashboard/config/linux/android-5.4-base.config b/dashboard/config/linux/android-5.4-base.config index 9fdd89f10..c2e49bb96 100644 --- a/dashboard/config/linux/android-5.4-base.config +++ b/dashboard/config/linux/android-5.4-base.config @@ -2258,7 +2258,7 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set # CONFIG_SERIAL_8250_ASPEED_VUART is not set CONFIG_SERIAL_8250_DWLIB=y diff --git a/dashboard/config/linux/android-5.4.config b/dashboard/config/linux/android-5.4.config index c108747ff..24e08ef74 100644 --- a/dashboard/config/linux/android-5.4.config +++ b/dashboard/config/linux/android-5.4.config @@ -2508,7 +2508,7 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set # CONFIG_SERIAL_8250_ASPEED_VUART is not set CONFIG_SERIAL_8250_DWLIB=y diff --git a/dashboard/config/linux/android-6.1-base.config b/dashboard/config/linux/android-6.1-base.config index 94b013984..7ad47160c 100644 --- a/dashboard/config/linux/android-6.1-base.config +++ b/dashboard/config/linux/android-6.1-base.config @@ -2640,7 +2640,7 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DWLIB=y # CONFIG_SERIAL_8250_DW is not set diff --git a/dashboard/config/linux/android-6.1.config b/dashboard/config/linux/android-6.1.config index 4ede3d6c8..c699049d0 100644 --- a/dashboard/config/linux/android-6.1.config +++ b/dashboard/config/linux/android-6.1.config @@ -2895,7 +2895,7 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DWLIB=y # CONFIG_SERIAL_8250_DW is not set diff --git a/dashboard/config/linux/android-6.12-base.config b/dashboard/config/linux/android-6.12-base.config index 2a06e295c..d7700836a 100644 --- a/dashboard/config/linux/android-6.12-base.config +++ b/dashboard/config/linux/android-6.12-base.config @@ -2858,7 +2858,7 @@ CONFIG_SERIAL_8250_PCILIB=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set # CONFIG_SERIAL_8250_PCI1XXXX is not set CONFIG_SERIAL_8250_DWLIB=y diff --git a/dashboard/config/linux/android-6.12.config b/dashboard/config/linux/android-6.12.config index 0820d634c..93c446fec 100644 --- a/dashboard/config/linux/android-6.12.config +++ b/dashboard/config/linux/android-6.12.config @@ -3112,7 +3112,7 @@ CONFIG_SERIAL_8250_PCILIB=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set # CONFIG_SERIAL_8250_PCI1XXXX is not set CONFIG_SERIAL_8250_DWLIB=y diff --git a/dashboard/config/linux/android14-5.15-cuttlefish-base.config b/dashboard/config/linux/android14-5.15-cuttlefish-base.config index 024b95c5e..22c4f4385 100644 --- a/dashboard/config/linux/android14-5.15-cuttlefish-base.config +++ b/dashboard/config/linux/android14-5.15-cuttlefish-base.config @@ -2557,7 +2557,7 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DWLIB=y # CONFIG_SERIAL_8250_DW is not set diff --git a/dashboard/config/linux/android14-5.15-cuttlefish.config b/dashboard/config/linux/android14-5.15-cuttlefish.config index 22b91a5fe..666446508 100644 --- a/dashboard/config/linux/android14-5.15-cuttlefish.config +++ b/dashboard/config/linux/android14-5.15-cuttlefish.config @@ -2693,7 +2693,7 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DWLIB=y # CONFIG_SERIAL_8250_DW is not set diff --git a/dashboard/config/linux/bits/android.yml b/dashboard/config/linux/bits/android.yml index d591caf14..0aba217cc 100644 --- a/dashboard/config/linux/bits/android.yml +++ b/dashboard/config/linux/bits/android.yml @@ -11,3 +11,5 @@ config: - CMDLINE: [append, "cgroup_disable=pressure cgroup.memory=nokmem"] # Disable -Werror for -Wframe-larger-than' warning - KVM_WERROR: n + # The kernel hangs during boot on qemu if it's set to 0. + - SERIAL_8250_RUNTIME_UARTS: 4 |