video: add an option for video simplefb via DT

Add an option to indicate that the video driver should setup a SimpleFB
node that passes the video framebuffer initialized by U-Boot to the
operating system kernel.

Currently only the Allwinner DE driver uses this option, and the
definition of this option in the sunxi-common.h config header is
converted to an imply of this option from CONFIG_VIDEO_SUNXI.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 3c29fc61f76c3549feeb27a10c90ef898eb91521..33869a3dde956e2aaf1fa29d5f759821593edc0c 100644 (file)
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -615,6 +615,7 @@ config VIDEO_SUNXI
        depends on !MACH_SUN9I
        depends on !MACH_SUN50I
        select VIDEO
+       imply VIDEO_DT_SIMPLEFB
        default y
        ---help---
        Say Y here to add support for using a cfb console on the HDMI, LCD

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e6b7f11dc9d33401a3fefdfd49a59b0e4066d2b6..45a105db06ae0551017b7488f8a8b5c97495d587 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -650,4 +650,12 @@ config VIDEO_SIMPLE
          before u-boot starts, and u-boot will simply render to the pre-
          allocated frame buffer surface.
 
+config VIDEO_DT_SIMPLEFB
+       bool "Enable SimpleFB support for passing framebuffer to OS"
+       help
+         Enables the code to pass the framebuffer to the kernel as a
+         simple framebuffer in the device tree.
+         The video output is initialized by U-Boot, and kept by the
+         kernel.
+
 endmenu

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 7d86b58417ee08ab126c048a7115c89a9a54027c..4207398eb90df105ee881613f1b52299daf210fc 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -275,9 +275,6 @@ extern int soft_i2c_gpio_scl;
  */
 #define CONFIG_SUNXI_MAX_FB_SIZE (16 << 20)
 
-/* Do we want to initialize a simple FB? */
-#define CONFIG_VIDEO_DT_SIMPLEFB
-
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_STD_TIMINGS
 #define CONFIG_I2C_EDID