Message ID | 1367528578-518090-8-git-send-email-arnd@arndb.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
* Arnd Bergmann <arnd@arndb.de> [130502 14:08]: > It is possible to build a kernel without TTY support, so we must not > attempt to select SERIAL_OMAP in that case. > > warning: (ARCH_OMAP2PLUS_TYPICAL) selects SERIAL_OMAP which has unmet direct dependencies (TTY && HAS_IOMEM && GENERIC_HARDIRQS && ARCH_OMAP2PLUS) > > Cc: Tony Lindgren <tony@atomide.com> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/mach-omap2/Kconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig > index 857b1f0..a95c7af 100644 > --- a/arch/arm/mach-omap2/Kconfig > +++ b/arch/arm/mach-omap2/Kconfig > @@ -37,8 +37,8 @@ config ARCH_OMAP2PLUS_TYPICAL > select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5 > select PM_RUNTIME > select REGULATOR > - select SERIAL_OMAP > - select SERIAL_OMAP_CONSOLE > + select SERIAL_OMAP if TTY > + select SERIAL_OMAP_CONSOLE if TTY > select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4 > select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4 > select VFP Please just drop this and pick my earlier fix instead: [PATCH 1/3] ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP Or let me know if you prefer me to queue it. Regards, Tony
On Friday 03 May 2013, Tony Lindgren wrote: > Please just drop this and pick my earlier fix instead: > > [PATCH 1/3] ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP > > Or let me know if you prefer me to queue it. I've applied your patch now. Should I also take the other two of that series? I was not on Cc for these patches, but all three seem to be required still. Arnd
* Arnd Bergmann <arnd@arndb.de> [130503 13:40]: > On Friday 03 May 2013, Tony Lindgren wrote: > > Please just drop this and pick my earlier fix instead: > > > > [PATCH 1/3] ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP > > > > Or let me know if you prefer me to queue it. > > I've applied your patch now. Should I also take the other two of that > series? I was not on Cc for these patches, but all three seem to be > required still. Yes go for it. Note that the two other patches have dependencies to branches for the current merge window, but you probably already have some base they can be applied against. Regards, Tony
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 857b1f0..a95c7af 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -37,8 +37,8 @@ config ARCH_OMAP2PLUS_TYPICAL select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5 select PM_RUNTIME select REGULATOR - select SERIAL_OMAP - select SERIAL_OMAP_CONSOLE + select SERIAL_OMAP if TTY + select SERIAL_OMAP_CONSOLE if TTY select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4 select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4 select VFP
It is possible to build a kernel without TTY support, so we must not attempt to select SERIAL_OMAP in that case. warning: (ARCH_OMAP2PLUS_TYPICAL) selects SERIAL_OMAP which has unmet direct dependencies (TTY && HAS_IOMEM && GENERIC_HARDIRQS && ARCH_OMAP2PLUS) Cc: Tony Lindgren <tony@atomide.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-omap2/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)