Convert CONFIG_HIDE_LOGO_VERSION to Kconfig

This converts the following to Kconfig:
   CONFIG_HIDE_LOGO_VERSION

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

diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index decbf5fbd60312b93834fed3b703e53263ec48ae..e1df6c76a353f4b027f0cfc7b2673b25e63bed00 100644 (file)
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -161,6 +161,7 @@ CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
+CONFIG_HIDE_LOGO_VERSION=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
 CONFIG_IMX_WATCHDOG=y
 CONFIG_FDT_FIXUP_PARTITIONS=y

diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index a5b31514ff12e09e3e310a32c65b5a25dcce905b..8d1bd9f8a9a95ff80369b893c4557c7395e7dea2 100644 (file)
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -165,6 +165,7 @@ CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
+CONFIG_HIDE_LOGO_VERSION=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
 CONFIG_IMX_WATCHDOG=y
 CONFIG_FDT_FIXUP_PARTITIONS=y

diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index ff826deb73e1c0566639a8ee07c6c766ae68a38e..c8701aa1e227a5ccfd43244fa7f89f20f7a3cb07 100644 (file)
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -171,6 +171,7 @@ CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
+CONFIG_HIDE_LOGO_VERSION=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
 CONFIG_IMX_WATCHDOG=y
 CONFIG_FDT_FIXUP_PARTITIONS=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 4d6c987df9c85bec64d30589721d025254735ab9..3e933ed76c8534172ce32b16759bc1ec0846d4ce 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -874,6 +874,15 @@ config SPLASH_SCREEN_ALIGN
                => vertically centered image
                   at x = dspWidth - bmpWidth - 9
 
+config HIDE_LOGO_VERSION
+       bool "Hide the version information on the splash screen"
+       help
+         Normally the U-Boot version string is shown on the display when the
+         splash screen is enabled. This information is not otherwise visible
+         since video starts up after U-Boot has displayed the initial banner.
+
+         Enable this option to hide this information.
+
 config SPLASH_SOURCE
        bool "Control the source of the splash image"
        help

diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 95ba20c686ba3f1001be4088ec89abbfc628fb73..176f80bb09b779c97114b5bd5519a390d37b5189 100644 (file)
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -34,7 +34,6 @@
 #define CONFIG_USBD_HS
 
 /* Video */
-#define CONFIG_HIDE_LOGO_VERSION
 #define CONFIG_IMX_VIDEO_SKIP
 
 /* Memory */

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index ad00769bdeefaab22027b089c1214207ece934c6..ab8c66f263d089ec27732168e6f2808077fc8c99 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -103,7 +103,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 
 /* Framebuffer */
-#define CONFIG_HIDE_LOGO_VERSION
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 82076ff74ff691c0a89b9f845121fa5b72f16b03..bba64af2c912427b90b43b46997a68b32d7bed37 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -47,7 +47,6 @@
 /* Framebuffer and LCD */
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
-#define CONFIG_HIDE_LOGO_VERSION  /* Custom config to hide U-boot version */
 
 /* Miscellaneous configurable options */
 #define CONFIG_HWCONFIG

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4c760fe62c886dda97934fd4788592d402e155ef..e6ee4cfb858da182c77f213592f35e6be22c90ba 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -64,7 +64,6 @@ CONFIG_G_DNL_THOR_VENDOR_NUM
 CONFIG_G_DNL_UMS_PRODUCT_NUM
 CONFIG_G_DNL_UMS_VENDOR_NUM
 CONFIG_HDMI_ENCODER_I2C_ADDR
-CONFIG_HIDE_LOGO_VERSION
 CONFIG_HIKEY_GPIO
 CONFIG_HOSTNAME
 CONFIG_HPS_ALTERAGRP_DBGATCLK