video kconfig console_normal

Signed-off-by: Simon Glass <sjg@chromium.org>
[agust: rebased on current master]
Signed-off-by: Anatolij Gustschin <agust@denx.de>

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 09ced0184a7a20a833f352e27c773091981f0a76..2ebcba0a889f5f0818998a55a96724bc420871e6 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -77,7 +77,7 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL=y
 CONFIG_DM_VIDEO=y
-CONFIG_VIDEO_ROTATION=y
+CONFIG_CONSOLE_ROTATION=y
 CONFIG_VIDEO_SANDBOX_SDL=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_TPM=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index f54631cc17288e790a65e11610c344d7edbc7031..d91b06b067da1bcc715fda02f4387b5cd379cdd4 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -44,7 +44,17 @@ config VIDEO_BPP32
          this option, such displays will not be supported and console output
          will be empty.
 
-config VIDEO_ROTATION
+config CONSOLE_NORMAL
+       bool "Support a simple text console"
+       depends on DM_VIDEO
+       default y if DM_VIDEO
+       help
+         Support drawing text on the frame buffer console so that it can be
+         used as a console. Rotation is not supported by this driver (see
+         CONFIG_CONSOLE_ROTATION for that). A built-in 8x16 font is used
+         for the display.
+
+config CONSOLE_ROTATION
        bool "Support rotated displays"
        depends on DM_VIDEO
        help

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index be908f6ed8f788324d865b68261a1fe29c04da97..4d845d6d1142ae8065c1034ce80fccaeac6deb24 100644 (file)
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -9,12 +9,13 @@ ifdef CONFIG_DM
 obj-$(CONFIG_DISPLAY) += display-uclass.o
 obj-$(CONFIG_DM_VIDEO) += backlight-uclass.o
 obj-$(CONFIG_DM_VIDEO) += panel-uclass.o simple_panel.o
-obj-$(CONFIG_DM_VIDEO) += video-uclass.o vidconsole-uclass.o console_normal.o
+obj-$(CONFIG_DM_VIDEO) += video-uclass.o vidconsole-uclass.o
 obj-$(CONFIG_DM_VIDEO) += video_bmp.o
 ifdef CONFIG_DM_VIDEO
 obj-$(CONFIG_DM_PWM) += pwm_backlight.o
 endif
-obj-$(CONFIG_VIDEO_ROTATION) += console_rotate.o
+obj-$(CONFIG_CONSOLE_NORMAL) += console_normal.o
+obj-$(CONFIG_CONSOLE_ROTATION) += console_rotate.o
 endif
 
 obj-$(CONFIG_ATI_RADEON_FB) += ati_radeon_fb.o videomodes.o