video: Drop references to CONFIG_VIDEO et al
Drop the Kconfigs which are not used and all references to them. In
particular, this drops CONFIG_VIDEO to avoid confusion and allow us to
eventually rename CONFIG_DM_VIDEO to CONFIG_VIDEO.
Also drop the prototype for video_get_info_str() which is no-longer used.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Jason Liu <jason.hui.liu@nxp.com>
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index c8c85c6..d074546 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -708,39 +708,9 @@
model. Video drivers typically provide a colour text console and
cursor.
-config VGA_AS_SINGLE_DEVICE
- bool "Set the video as an output-only device"
- depends on CFB_CONSOLE
- default y
- help
- If enable the framebuffer device will be initialized as an
- output-only device. The Keyboard driver will not be set up. This
- may be used if you have no keyboard device, or more than one
- (USB Keyboard, AT Keyboard).
-
-config VIDEO_SW_CURSOR
- bool "Enable a software cursor"
- depends on CFB_CONSOLE
- default y if CFB_CONSOLE
- help
- This draws a cursor after the last character. No blinking is
- provided. This makes it possible to see the current cursor
- position when entering text on the console. It is recommended to
- enable this.
-
-config CONSOLE_EXTRA_INFO
- bool "Display additional board information"
- depends on CFB_CONSOLE
- help
- Display additional board information strings that normally go to
- the serial port. When this option is enabled, a board-specific
- function video_get_info_str() is called to get the string for
- each line of the display. The function should return the string,
- which can be empty if there is nothing to display for that line.
-
config CONSOLE_SCROLL_LINES
int "Number of lines to scroll the console by"
- depends on CFB_CONSOLE || DM_VIDEO || LCD
+ depends on DM_VIDEO || LCD
default 1
help
When the console need to be scrolled, this is the number of
@@ -748,28 +718,6 @@
console jump but can help speed up operation when scrolling
is slow.
-config SYS_CONSOLE_BG_COL
- hex "Background colour"
- depends on CFB_CONSOLE
- default 0x00
- help
- Defines the background colour for the console. The value is from
- 0x00 to 0xff and the meaning depends on the graphics card.
- Typically, 0x00 means black and 0xff means white. Do not set
- the background and foreground to the same colour or you will see
- nothing.
-
-config SYS_CONSOLE_FG_COL
- hex "Foreground colour"
- depends on CFB_CONSOLE
- default 0xa0
- help
- Defines the foreground colour for the console. The value is from
- 0x00 to 0xff and the meaning depends on the graphics card.
- Typically, 0x00 means black and 0xff means white. Do not set
- the background and foreground to the same colour or you will see
- nothing.
-
config LCD
bool "Enable legacy LCD support"
help
@@ -967,7 +915,7 @@
config VIDEO_BMP_RLE8
bool "Run length encoded BMP image (RLE8) support"
- depends on DM_VIDEO || CFB_CONSOLE
+ depends on DM_VIDEO
help
If this option is set, the 8-bit RLE compressed BMP images
is supported.
diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index 0a9cea6..090fd6e 100644
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -562,7 +562,6 @@
}
struct nx_display_dev *dp;
- /* unsigned int pp_index = 0; */
dp = nx_display_setup();
if (!dp) {
@@ -572,9 +571,7 @@
}
switch (dp->depth) {
-#if 0 /* GDF_16BIT_565RGB is not defined in video.h */
case 2:
- pp_index = GDF_16BIT_565RGB;
uc_priv->bpix = VIDEO_BPP16;
break;
case 3:
@@ -582,10 +579,8 @@
* type video_log2_bpp
*/
case 4:
- pp_index = GDF_32BIT_X888RGB;
uc_priv->bpix = VIDEO_BPP32;
break;
-#endif
default:
printf("fail : not support LCD bit per pixel %d\n",
dp->depth * 8);
@@ -598,8 +593,7 @@
/*
* set environment variable "fb_addr" (frame buffer address), required
- * for splash image. Because drv_video_init() in common/stdio.c is only
- * called when CONFIG_VIDEO is set (and not if CONFIG_DM_VIDEO is set).
+ * for splash image, which is not set if CONFIG_DM_VIDEO is enabled).
*/
sprintf(addr, "0x%x", dp->fb_addr);
debug("%s(): env_set(\"fb_addr\", %s) ...\n", __func__, addr);