[04/11] ARM: defconfig: drop CONFIG_SERIAL_OMAP references

Commit Message

Arnd Bergmann Aug. 18, 2022, 1:57 p.m. UTC

From: Arnd Bergmann <[e-mail]>

This driver is mutually exclusive with the new 8250_OMAP
driver, so 'make defconfig' turns it off already. Drop
the reference now.

Fixes: 077e1cde78c3 ("ARM: omap2plus_defconfig: Enable 8250_OMAP")
Fixes: f98d45145e6a ("ARM: multi_v7_defconfig: Enable 8250-omap serial driver and use it by default")
Signed-off-by: Arnd Bergmann <[e-mail]>
---
 arch/arm/configs/multi_v7_defconfig  | 2 --
 arch/arm/configs/omap2plus_defconfig | 2 --
 2 files changed, 4 deletions(-)

Comments

Tony Lindgren Aug. 22, 2022, 5:46 a.m. UTC | #1

* Arnd Bergmann <[e-mail]> [220818 13:51]:
> From: Arnd Bergmann <[e-mail]>
> 
> This driver is mutually exclusive with the new 8250_OMAP
> driver, so 'make defconfig' turns it off already. Drop
> the reference now.

Acked-by: Tony Lindgren <[e-mail]>

Patch

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index ecf743b3409d..4cfe795981c8 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -377,8 +377,6 @@  CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SERIAL_VT8500=y
 CONFIG_SERIAL_VT8500_CONSOLE=y
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIAL_BCM63XX=y
 CONFIG_SERIAL_BCM63XX_CONSOLE=y
 CONFIG_SERIAL_XILINX_PS_UART=y
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index e273365838cb..89cda0877c52 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -419,8 +419,6 @@  CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_OMAP=y
 CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_SPI=y