video: Convert CONFIG_VIDEO_LOGO to Kconfig

This converts the following to Kconfig:
   CONFIG_VIDEO_LOGO

Note that this option depends on CONFIG_DM_VIDEO now, since cfb_console is
deprecated. The only relevant code is now in splash.c

Drop the check for DM_VIDEO in that file.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-11-19 13:24:01 -07:00 committed by Anatolij Gustschin
parent cd4fb0f054
commit 64cfeda8ae
77 changed files with 48 additions and 39 deletions

1
README
View File

@ -1042,7 +1042,6 @@ The following options need to be configured:
CONFIG_CFB_CONSOLE CONFIG_CFB_CONSOLE
CONFIG_VIDEO_SW_CURSOR CONFIG_VIDEO_SW_CURSOR
CONFIG_VGA_AS_SINGLE_DEVICE CONFIG_VGA_AS_SINGLE_DEVICE
CONFIG_VIDEO_LOGO
CONFIG_VIDEO_BMP_LOGO CONFIG_VIDEO_BMP_LOGO
The DIU driver will look for the 'video-mode' environment The DIU driver will look for the 'video-mode' environment

View File

@ -52,7 +52,7 @@ static struct splash_location default_splash_locations[] = {
}, },
}; };
#if defined(CONFIG_DM_VIDEO) && defined(CONFIG_VIDEO_LOGO) #ifdef CONFIG_VIDEO_LOGO
#include <bmp_logo_data.h> #include <bmp_logo_data.h>

View File

@ -105,6 +105,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

View File

@ -109,6 +109,7 @@ CONFIG_SYSRESET_WATCHDOG=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_DISPLAY=y CONFIG_DISPLAY=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y

View File

@ -109,6 +109,7 @@ CONFIG_SYSRESET_WATCHDOG=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_DISPLAY=y CONFIG_DISPLAY=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y

View File

@ -106,6 +106,7 @@ CONFIG_USB=y
CONFIG_USB_KEYBOARD=y CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SOURCE=y CONFIG_SPLASH_SOURCE=y

View File

@ -79,6 +79,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

View File

@ -95,6 +95,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_MXS=y CONFIG_VIDEO_MXS=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y

View File

@ -103,6 +103,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

View File

@ -91,6 +91,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_MXS=y CONFIG_VIDEO_MXS=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y

View File

@ -84,6 +84,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

View File

@ -99,6 +99,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP16 is not set # CONFIG_VIDEO_BPP16 is not set
CONFIG_VIDEO_FSL_DCU_FB=y CONFIG_VIDEO_FSL_DCU_FB=y

View File

@ -140,6 +140,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y CONFIG_USB_ETH_CDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_BACKLIGHT is not set # CONFIG_BACKLIGHT is not set
# CONFIG_CMD_VIDCONSOLE is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set

View File

@ -144,6 +144,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y CONFIG_USB_ETH_CDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_BACKLIGHT is not set # CONFIG_BACKLIGHT is not set
# CONFIG_CMD_VIDCONSOLE is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set

View File

@ -148,6 +148,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y CONFIG_USB_ETH_CDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_BACKLIGHT is not set # CONFIG_BACKLIGHT is not set
# CONFIG_CMD_VIDCONSOLE is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set

View File

@ -66,6 +66,7 @@ CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y CONFIG_IMX_THERMAL=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

View File

@ -67,6 +67,7 @@ CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y CONFIG_IMX_THERMAL=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

View File

@ -84,6 +84,7 @@ CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y CONFIG_IMX_THERMAL=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

View File

@ -67,6 +67,7 @@ CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y CONFIG_IMX_THERMAL=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

View File

@ -72,6 +72,7 @@ CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set # CONFIG_SPL_DM_USB is not set
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_BACKLIGHT_GPIO=y CONFIG_BACKLIGHT_GPIO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_MXS=y CONFIG_VIDEO_MXS=y

View File

@ -111,6 +111,7 @@ CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

View File

@ -57,6 +57,7 @@ CONFIG_USB=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_BACKLIGHT is not set # CONFIG_BACKLIGHT is not set
# CONFIG_CMD_VIDCONSOLE is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set

View File

@ -70,6 +70,7 @@ CONFIG_IMX_THERMAL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_KEYBOARD=y CONFIG_USB_KEYBOARD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_BACKLIGHT is not set # CONFIG_BACKLIGHT is not set
# CONFIG_CMD_VIDCONSOLE is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set

View File

@ -111,6 +111,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

View File

@ -118,6 +118,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

View File

@ -94,6 +94,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_MXS=y CONFIG_VIDEO_MXS=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y

View File

@ -84,6 +84,7 @@ CONFIG_IMX_THERMAL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_MXS=y CONFIG_VIDEO_MXS=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y

View File

@ -85,6 +85,7 @@ CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y CONFIG_USB_ETH_CDC=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

View File

@ -105,6 +105,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

View File

@ -85,6 +85,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

View File

@ -85,6 +85,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

View File

@ -82,6 +82,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_BACKLIGHT is not set # CONFIG_BACKLIGHT is not set
# CONFIG_CMD_VIDCONSOLE is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set

View File

@ -79,6 +79,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_VIDEO_MXS=y CONFIG_VIDEO_MXS=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

View File

@ -83,6 +83,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_MXS=y CONFIG_VIDEO_MXS=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y

View File

@ -85,6 +85,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_MXS=y CONFIG_VIDEO_MXS=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y

View File

@ -85,6 +85,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

View File

@ -85,6 +85,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

View File

@ -69,6 +69,7 @@ CONFIG_USB=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_BACKLIGHT is not set # CONFIG_BACKLIGHT is not set
# CONFIG_CMD_VIDCONSOLE is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set

View File

@ -50,6 +50,7 @@ CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR=y
CONFIG_CONS_INDEX=0 CONFIG_CONS_INDEX=0
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_DISPLAY=y CONFIG_DISPLAY=y
CONFIG_VIDEO_NX=y CONFIG_VIDEO_NX=y
CONFIG_VIDEO_NX_RGB=y CONFIG_VIDEO_NX_RGB=y

View File

@ -74,6 +74,7 @@ CONFIG_MXC_UART=y
CONFIG_DM_THERMAL=y CONFIG_DM_THERMAL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

View File

@ -14,6 +14,15 @@ config DM_VIDEO
option compiles in the video uclass and routes all LCD/video access option compiles in the video uclass and routes all LCD/video access
through this. through this.
config VIDEO_LOGO
bool "Show the U-Boot logo on the display"
depends on DM_VIDEO
help
This enables showing the U-Boot logo on the display when a video
device is probed. It appears at the top right. The logo itself is at
tools/logos/u-boot_logo.bmp and looks best when the display has a
black background.
config BACKLIGHT config BACKLIGHT
bool "Enable panel backlight uclass support" bool "Enable panel backlight uclass support"
depends on DM_VIDEO depends on DM_VIDEO

View File

@ -380,7 +380,6 @@ unsigned long get_board_sys_clk(void);
#undef CONFIG_FSL_DIU_FB /* RDB doesn't support DIU */ #undef CONFIG_FSL_DIU_FB /* RDB doesn't support DIU */
#ifdef CONFIG_FSL_DIU_FB #ifdef CONFIG_FSL_DIU_FB
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
/* /*

View File

@ -367,7 +367,6 @@
#ifdef CONFIG_FSL_DIU_FB #ifdef CONFIG_FSL_DIU_FB
#define CONFIG_FSL_DIU_CH7301 #define CONFIG_FSL_DIU_CH7301
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#endif #endif
#endif #endif

View File

@ -46,7 +46,6 @@
/* Framebuffer and LCD */ /* Framebuffer and LCD */
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

View File

@ -443,7 +443,6 @@
/* Framebuffer */ /* Framebuffer */
/* check this console not needed, after test remove it */ /* check this console not needed, after test remove it */
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX6_PWM_PER_CLK 66000000 #define CONFIG_IMX6_PWM_PER_CLK 66000000

View File

@ -177,7 +177,6 @@
/* Display */ /* Display */
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
/* EEPROM */ /* EEPROM */

View File

@ -164,7 +164,6 @@
#if defined(CONFIG_DM_VIDEO) #if defined(CONFIG_DM_VIDEO)
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#endif #endif

View File

@ -36,7 +36,6 @@
/* Framebuffer and LCD */ /* Framebuffer and LCD */
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

View File

@ -197,7 +197,6 @@
#define CONFIG_USBD_HS #define CONFIG_USBD_HS
#if defined(CONFIG_DM_VIDEO) #if defined(CONFIG_DM_VIDEO)
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#endif #endif

View File

@ -17,7 +17,6 @@
#define CONFIG_SYS_FSL_CLK #define CONFIG_SYS_FSL_CLK
#ifdef CONFIG_VIDEO_FSL_DCU_FB #ifdef CONFIG_VIDEO_FSL_DCU_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_SYS_FSL_DCU_LE #define CONFIG_SYS_FSL_DCU_LE

View File

@ -52,7 +52,6 @@
#endif #endif
/* Framebuffer */ /* Framebuffer */
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

View File

@ -72,7 +72,6 @@
#define CONFIG_USBD_HS #define CONFIG_USBD_HS
/* Framebuffer and LCD */ /* Framebuffer and LCD */
#define CONFIG_VIDEO_LOGO
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO

View File

@ -154,7 +154,6 @@
#ifdef CONFIG_VIDEO_IPUV3 #ifdef CONFIG_VIDEO_IPUV3
# define CONFIG_IMX_VIDEO_SKIP # define CONFIG_IMX_VIDEO_SKIP
# define CONFIG_VIDEO_LOGO
# define CONFIG_VIDEO_BMP_LOGO # define CONFIG_VIDEO_BMP_LOGO
#endif #endif

View File

@ -22,7 +22,6 @@
DMAMEM_SZ_ALL) DMAMEM_SZ_ALL)
#ifdef CONFIG_DM_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

View File

@ -323,7 +323,6 @@ unsigned long get_board_sys_clk(void);
* Video * Video
*/ */
#ifdef CONFIG_VIDEO_FSL_DCU_FB #ifdef CONFIG_VIDEO_FSL_DCU_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_FSL_DIU_CH7301 #define CONFIG_FSL_DIU_CH7301

View File

@ -209,7 +209,6 @@
* Video * Video
*/ */
#ifdef CONFIG_VIDEO_FSL_DCU_FB #ifdef CONFIG_VIDEO_FSL_DCU_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_FSL_DCU_SII9022A #define CONFIG_FSL_DCU_SII9022A

View File

@ -112,7 +112,6 @@
/* /*
* LCD * LCD
*/ */
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)
/* LVDS display */ /* LVDS display */

View File

@ -27,7 +27,6 @@
/* Framebuffer support */ /* Framebuffer support */
#ifdef CONFIG_DM_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
#endif #endif

View File

@ -41,7 +41,6 @@
/* Framebuffer support */ /* Framebuffer support */
#ifdef CONFIG_DM_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
#endif #endif

View File

@ -45,7 +45,6 @@
#define CONFIG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED #define CONFIG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED
/* Framebuffer and LCD */ /* Framebuffer and LCD */
#define CONFIG_VIDEO_LOGO
#define CONFIG_ETHPRIME "FEC0" #define CONFIG_ETHPRIME "FEC0"

View File

@ -134,6 +134,5 @@
#endif #endif
/* Framebuffer and LCD */ /* Framebuffer and LCD */
#define CONFIG_VIDEO_LOGO
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

View File

@ -25,7 +25,6 @@
#endif #endif
/* Framebuffer */ /* Framebuffer */
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

View File

@ -153,7 +153,6 @@
/* Environment organization */ /* Environment organization */
/* Framebuffer */ /* Framebuffer */
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

View File

@ -148,7 +148,6 @@
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_DM_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR
#endif #endif

View File

@ -151,7 +151,6 @@
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#if defined(CONFIG_DM_VIDEO) #if defined(CONFIG_DM_VIDEO)
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#endif #endif

View File

@ -125,7 +125,6 @@
#define CONFIG_USBD_HS #define CONFIG_USBD_HS
#ifdef CONFIG_DM_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#endif #endif

View File

@ -75,7 +75,6 @@
* Framebuffer * Framebuffer
*/ */
/* Video console */ /* Video console */
#define CONFIG_VIDEO_LOGO
#define VIDEO_FB_16BPP_PIXEL_SWAP #define VIDEO_FB_16BPP_PIXEL_SWAP
#define VIDEO_FB_16BPP_WORD_SWAP #define VIDEO_FB_16BPP_WORD_SWAP

View File

@ -86,7 +86,6 @@
#endif #endif
/* Video output */ /* Video output */
#define CONFIG_VIDEO_LOGO
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

View File

@ -41,7 +41,6 @@
/* LCD */ /* LCD */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_DM_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#endif #endif

View File

@ -136,7 +136,6 @@
#define CONFIG_FEC_MXC_PHYADDR 1 #define CONFIG_FEC_MXC_PHYADDR 1
/* Framebuffer */ /* Framebuffer */
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

View File

@ -133,7 +133,6 @@
#define CONFIG_BOARD_SIZE_LIMIT 715776 #define CONFIG_BOARD_SIZE_LIMIT 715776
#ifdef CONFIG_DM_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#endif #endif

View File

@ -124,7 +124,6 @@
#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08
#ifdef CONFIG_DM_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#endif #endif

View File

@ -76,7 +76,6 @@
#if defined(CONFIG_VIDEO) #if defined(CONFIG_VIDEO)
#define CONFIG_VIDEO_DA8XX #define CONFIG_VIDEO_DA8XX
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE #define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE
#define PWM_TICKS 0x1388 #define PWM_TICKS 0x1388

View File

@ -69,7 +69,6 @@
#if defined(CONFIG_VIDEO) #if defined(CONFIG_VIDEO)
#define CONFIG_VIDEO_DA8XX #define CONFIG_VIDEO_DA8XX
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE #define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE

View File

@ -131,8 +131,6 @@
* VIDEO * VIDEO
*/ */
#define CONFIG_VIDEO_LOGO
#ifdef CONFIG_VIDEO_LOGO #ifdef CONFIG_VIDEO_LOGO
#ifdef CONFIG_SPLASH_SCREEN #ifdef CONFIG_SPLASH_SCREEN
#define SPLASH_FILE logo.bmp #define SPLASH_FILE logo.bmp

View File

@ -32,7 +32,6 @@
#define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_MXC_USB_FLAGS 0
/* Framebuffer */ /* Framebuffer */
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP

View File

@ -3041,7 +3041,6 @@ CONFIG_VIDEO_BCM2835
CONFIG_VIDEO_BMP_LOGO CONFIG_VIDEO_BMP_LOGO
CONFIG_VIDEO_DA8XX CONFIG_VIDEO_DA8XX
CONFIG_VIDEO_FONT_4X6 CONFIG_VIDEO_FONT_4X6
CONFIG_VIDEO_LOGO
CONFIG_VIDEO_MXS_MODE_SYSTEM CONFIG_VIDEO_MXS_MODE_SYSTEM
CONFIG_VIDEO_STD_TIMINGS CONFIG_VIDEO_STD_TIMINGS
CONFIG_VID_FLS_ENV CONFIG_VID_FLS_ENV