From d54d036966cb907c3b096355c00548677e37f951 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 13 Oct 2021 13:47:52 -0700 Subject: [PATCH] Revert "ANDROID: gki_defconfig: Don't explicity enable CONFIG_SERIAL_SAMSUNG{_CONSOLE}" This reverts commit 90afe921288ec005be6a4ebaaa8085fe50c51e86. We need this back now that we are dropping ARCH_EXYNOS from the gki_defconfig. Bug: 142159113 Bug: 145560197 Change-Id: Idea0d64a31c37ebcacf63e58add56640f1a64605 Signed-off-by: Will McVicker --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 12fd514a7c70..f01d36fa6b93 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -368,6 +368,8 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_SAMSUNG=y +CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_QCOM_GENI=y CONFIG_SERIAL_QCOM_GENI_CONSOLE=y CONFIG_SERIAL_SPRD=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 03fdeb265c80..0b966261eab1 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -339,6 +339,8 @@ CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SERIAL_SAMSUNG=y +CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_HW_RANDOM=y # CONFIG_DEVMEM is not set