[U-Boot] [PATCH 03/19] video kconfig console_normal

Simon Glass
2016-01-15T01:10:36Z

configs/sandbox_defconfig | 2 +-
drivers/video/Kconfig | 12 +++++++++++-
drivers/video/Makefile | 5 +++--
3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index b55d5e5..aa92726 100644
--- 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_SYS_VSNPRINTF=y
CONFIG_CMD_DHRYSTONE=y
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 35fe192..29ddde2 100644
--- 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 f6f1106..1a76655 100644
--- 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
--
2.6.0.rc2.230.g3dd15c0