video: fix up versatile CLCD helper move

commit 11c32d7b62 ("video: move Versatile CLCD helpers")
moved files out of the plat-versatile directory but in the process
got a few of the dependencies wrong:

- If CONFIG_FB is not set, the file no longer gets built, resulting
  in a link error
- If CONFIG_FB or CONFIG_FB_ARMCLCD are disabled, we also get a
  Kconfig warning for incorrect dependencies due to the symbol
  being 'select'ed from the platform Kconfig.
- When the file is not built, we also get a link error for missing
  symbols.

This patch should fix all three, by removing the 'select' statements,
changing the Kconfig description of the symbol to be enabled in
exactly the right configurations, and adding inline stub functions
for the case when the framebuffer driver is disabled.

Signed-off-by: Arnd Bergmann <[email protected]>
Reviewed-by: Linus Walleij <[email protected]>
This commit is contained in:
Arnd Bergmann 2014-07-15 09:58:06 +02:00
commit ec4c4d877b
4 changed files with 20 additions and 7 deletions

View file

@ -292,10 +292,8 @@ config FB_ARMCLCD
# Helper logic selected only by the ARM Versatile platform family.
config PLAT_VERSATILE_CLCD
depends on FB_ARMCLCD
depends on (PLAT_VERSATILE || ARCH_INTEGRATOR)
default y
bool
def_bool ARCH_VERSATILE || ARCH_REALVIEW || ARCH_VEXPRESS
depends on FB_ARMCLCD && FB=y
config FB_ACORN
bool "Acorn VIDC support"