| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Ram Muthiah <rammuthiah@google.com> |
| Date: Sun, 15 Sep 2019 23:24:48 -0700 |
| Subject: ANDROID: Removed extraneous serial 8250 configs |
| |
| Signed-off-by: Ram Muthiah <rammuthiah@google.com> |
| Test: Local Boot of cuttlefish with this kernel |
| Bug: 132629930 |
| Change-Id: I12afb2b95105bfdbaa81cc51367664fa36a4f60c |
| --- |
| arch/arm64/configs/gki_defconfig | 4 ---- |
| arch/x86/configs/gki_defconfig | 4 ---- |
| 2 files changed, 8 deletions(-) |
| |
| diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig |
| index d650f7d141e7..ea9960028cfd 100644 |
| --- a/arch/arm64/configs/gki_defconfig |
| +++ b/arch/arm64/configs/gki_defconfig |
| @@ -264,10 +264,6 @@ CONFIG_SERIAL_8250=y |
| # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set |
| CONFIG_SERIAL_8250_CONSOLE=y |
| # CONFIG_SERIAL_8250_EXAR is not set |
| -CONFIG_SERIAL_8250_NR_UARTS=48 |
| -CONFIG_SERIAL_8250_EXTENDED=y |
| -CONFIG_SERIAL_8250_MANY_PORTS=y |
| -CONFIG_SERIAL_8250_SHARE_IRQ=y |
| CONFIG_SERIAL_OF_PLATFORM=m |
| CONFIG_SERIAL_AMBA_PL011=y |
| CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
| diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig |
| index 511a763add37..a5953d43d480 100644 |
| --- a/arch/x86/configs/gki_defconfig |
| +++ b/arch/x86/configs/gki_defconfig |
| @@ -237,10 +237,6 @@ CONFIG_INPUT_UINPUT=y |
| CONFIG_SERIAL_8250=y |
| # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set |
| CONFIG_SERIAL_8250_CONSOLE=y |
| -CONFIG_SERIAL_8250_NR_UARTS=48 |
| -CONFIG_SERIAL_8250_EXTENDED=y |
| -CONFIG_SERIAL_8250_MANY_PORTS=y |
| -CONFIG_SERIAL_8250_SHARE_IRQ=y |
| CONFIG_SERIAL_OF_PLATFORM=m |
| CONFIG_HW_RANDOM=y |
| CONFIG_HW_RANDOM_VIRTIO=m |
