Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb16d332 authored by Tony Lindgren's avatar Tony Lindgren Committed by Arnd Bergmann
Browse files

ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP 



Commit 8a6201b9 (ARM: OMAP2+: Fix unmet direct dependencies for zoom
for 8250 serial) fixed unmet direct dependencies for 8250, but failed
to do the same for omap serial. This can cause the following warning:

warning: (ARCH_OMAP2PLUS_TYPICAL) selects SERIAL_OMAP which has
unmet direct dependencies (TTY && HAS_IOMEM && GENERIC_HARDIRQS &&
ARCH_OMAP2PLUS).

We should not select drivers, they should be selected by the
user. Fix the issue by removing the select and adding them to
omap2plus_defconfig instead.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent ccefeea9

arch/arm/configs/omap2plus_defconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -134,6 +134,8 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y 
CONFIG_SERIAL_8250_RSA=y

CONFIG_SERIAL_8250_RSA=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_OMAP=y

CONFIG_SERIAL_OMAP_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_CHARDEV=y

CONFIG_SPI=y

CONFIG_SPI=y

arch/arm/mach-omap2/Kconfig

+0 −2
Original line number Original line Diff line number Diff line
@@ -36,8 +36,6 @@ config ARCH_OMAP2PLUS_TYPICAL 
	select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5

	select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5

	select PM_RUNTIME

	select PM_RUNTIME

	select REGULATOR

	select REGULATOR

	select SERIAL_OMAP

	select SERIAL_OMAP_CONSOLE

	select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4

	select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4

	select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4

	select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4

	select VFP

	select VFP