video: Show the U-Boot logo by default

Enable this for boards with a display, unless they are using the SPLASH
feature.

This shows a U-Boot logo on boards with a display, which seems like a
useful thing.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig
index 7c7974c123c13c3074b6425dbb0e30d53238be22..a034cad36089cd60093d09d7d702408918ddffbd 100644 (file)
--- a/configs/gurnard_defconfig
+++ b/configs/gurnard_defconfig
@@ -50,5 +50,6 @@ CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_DM_VIDEO=y
+# CONFIG_VIDEO_LOGO is not set
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_CMD_DHRYSTONE=y

diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index c623a547733307558f56a554168f6538881ba310..e1278f2e70a536d060d13b433711c7e9a911c8de 100644 (file)
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -94,6 +94,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_DM_VIDEO=y
+# CONFIG_VIDEO_LOGO is not set
 # CONFIG_BACKLIGHT is not set
 # CONFIG_CMD_VIDCONSOLE is not set
 # CONFIG_VIDEO_BPP8 is not set

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e601b47806b0a6754bdd7444badb75da744db8e5..cfa08b501bad6f67c8f1365fff893f0c037b01d7 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -17,6 +17,7 @@ config DM_VIDEO
 config VIDEO_LOGO
        bool "Show the U-Boot logo on the display"
        depends on DM_VIDEO
+       default y if !SPLASH_SCREEN
        select VIDEO_BMP_RLE8
        help
          This enables showing the U-Boot logo on the display when a video