configs: migrate CONFIG_VIDEO_BMP_GZIP to defconfigs

Done with:
./tools/moveconfig.py VIDEO_BMP_GZIP

The 3 suspicious migration because CMD_BMP and SPLASH_SCREEN
are not activated in these defconfigs:
- trats_defconfig
- s5pc210_universal_defconfig
- trats2_defconfig

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/README b/README
index 91c5a1a..10c2671 100644 (file)
--- a/README
+++ b/README
@@ -1250,12 +1250,6 @@ The following options need to be configured:
                Enables an 'i2c edid' command which can read EDID
                information over I2C from an attached LCD display.
 
                Enables an 'i2c edid' command which can read EDID
                information over I2C from an attached LCD display.
 

-- Gzip compressed BMP image support: CONFIG_VIDEO_BMP_GZIP
-
-               If this option is set, additionally to standard BMP
-               images, gzipped BMP images can be displayed via the
-               splashscreen support or the bmp command.
-

 - Run length encoded BMP image (RLE8) support: CONFIG_VIDEO_BMP_RLE8
 
                If this option is set, 8-bit RLE compressed BMP images
 - Run length encoded BMP image (RLE8) support: CONFIG_VIDEO_BMP_RLE8
 
                If this option is set, 8-bit RLE compressed BMP images

diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index f68395f..f32a5ba 100644 (file)
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -104,5 +104,6 @@ CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASHIMAGE_GUARD=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_SPLASH_SOURCE=y
 CONFIG_SPLASHIMAGE_GUARD=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_SPLASH_SOURCE=y

+CONFIG_VIDEO_BMP_GZIP=y

 CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
 CONFIG_IMX_WATCHDOG=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
 CONFIG_IMX_WATCHDOG=y

diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig
index 6b89937..93b2c8b 100644 (file)
--- a/configs/mx23evk_defconfig
+++ b/configs/mx23evk_defconfig
@@ -39,4 +39,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y
 CONFIG_SPLASH_SCREEN=y

+CONFIG_VIDEO_BMP_GZIP=y

 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig
index fe63221..1f3b65f 100644 (file)
--- a/configs/mx28evk_auart_console_defconfig
+++ b/configs/mx28evk_auart_console_defconfig
@@ -58,4 +58,5 @@ CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 CONFIG_SPLASH_SCREEN=y

+CONFIG_VIDEO_BMP_GZIP=y

 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index 5985777..74c4211 100644 (file)
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@@ -58,4 +58,5 @@ CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 CONFIG_SPLASH_SCREEN=y

+CONFIG_VIDEO_BMP_GZIP=y

 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
index 7954e03..a75570c 100644 (file)
--- a/configs/mx28evk_nand_defconfig
+++ b/configs/mx28evk_nand_defconfig
@@ -59,4 +59,5 @@ CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 CONFIG_SPLASH_SCREEN=y

+CONFIG_VIDEO_BMP_GZIP=y

 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index 8ed9a5a..fa2835e 100644 (file)
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@@ -55,4 +55,5 @@ CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 CONFIG_SPLASH_SCREEN=y

+CONFIG_VIDEO_BMP_GZIP=y

 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index aeb266d..bf7509e 100644 (file)
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -82,3 +82,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y

+CONFIG_VIDEO_BMP_GZIP=y

diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index afe3943..924ad25 100644 (file)
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -83,3 +83,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y

+CONFIG_VIDEO_BMP_GZIP=y

diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 610055a..bc1c983 100644 (file)
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -83,3 +83,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y

+CONFIG_VIDEO_BMP_GZIP=y

diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index a31d4a6..9edb403 100644 (file)
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -85,3 +85,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y

+CONFIG_VIDEO_BMP_GZIP=y

diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index d6224bc..6357776 100644 (file)
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -85,3 +85,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y

+CONFIG_VIDEO_BMP_GZIP=y

diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 37393e9..d04b221 100644 (file)
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -83,3 +83,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y

+CONFIG_VIDEO_BMP_GZIP=y

diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 8c8344d..d5bb17b 100644 (file)
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -83,3 +83,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y

+CONFIG_VIDEO_BMP_GZIP=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e2e1f9c..6363807 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -939,4 +939,12 @@ config SPLASH_SOURCE
          In case the environment variable "splashfile" is not defined the
          default name 'splash.bmp' will be used.
 
          In case the environment variable "splashfile" is not defined the
          default name 'splash.bmp' will be used.
 

+config VIDEO_BMP_GZIP
+       bool "Gzip compressed BMP image support"
+       depends on CMD_BMP || SPLASH_SCREEN
+       help
+         If this option is set, additionally to standard BMP
+         images, gzipped BMP images can be displayed via the
+         splashscreen support or the bmp command.
+

 endmenu
 endmenu

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index c15e7d2..f274b96 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -127,7 +127,6 @@
  * LCD
  */
 #define CONFIG_VIDEO_BMP_RLE8
  * LCD
  */
 #define CONFIG_VIDEO_BMP_RLE8

-#define CONFIG_VIDEO_BMP_GZIP

 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)

diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index 8f170b2..bebaf5a 100644 (file)
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -33,7 +33,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_BMP_RLE8

-#define CONFIG_VIDEO_BMP_GZIP

 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
 #endif
 
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
 #endif
 

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index d65f6a9..0b71deb 100644 (file)
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -54,7 +54,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_BMP_RLE8

-#define CONFIG_VIDEO_BMP_GZIP

 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
 #endif
 
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
 #endif
 

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index f1780b2..ed43963 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -57,7 +57,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_BMP_RLE8
 
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_BMP_RLE8

-#define CONFIG_VIDEO_BMP_GZIP

 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024)
 #define CONFIG_BMP_16BPP
 #define CONFIG_IMX_HDMI
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024)
 #define CONFIG_BMP_16BPP
 #define CONFIG_IMX_HDMI

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index da6ed97..673797e 100644 (file)
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -160,7 +160,6 @@ int universal_spi_read(void);
  */
 #define CONFIG_BMP_16BPP
 #define CONFIG_LD9040
  */
 #define CONFIG_BMP_16BPP
 #define CONFIG_LD9040

-#define CONFIG_VIDEO_BMP_GZIP

 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
 
 #endif /* __CONFIG_H */
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/trats.h b/include/configs/trats.h
index 3202627..acfa9fe 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -181,7 +181,6 @@
 #define CONFIG_BMP_16BPP
 #define CONFIG_FB_ADDR         0x52504000
 #define CONFIG_EXYNOS_MIPI_DSIM
 #define CONFIG_BMP_16BPP
 #define CONFIG_FB_ADDR         0x52504000
 #define CONFIG_EXYNOS_MIPI_DSIM

-#define CONFIG_VIDEO_BMP_GZIP

 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE  ((500 * 160 * 4) + 54)
 
 #endif /* __CONFIG_H */
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE  ((500 * 160 * 4) + 54)
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 14549dd..06d80ce 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -164,7 +164,6 @@
 #define CONFIG_BMP_16BPP
 #define CONFIG_FB_ADDR         0x52504000
 #define CONFIG_EXYNOS_MIPI_DSIM
 #define CONFIG_BMP_16BPP
 #define CONFIG_FB_ADDR         0x52504000
 #define CONFIG_EXYNOS_MIPI_DSIM

-#define CONFIG_VIDEO_BMP_GZIP

 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
 
 #endif /* __CONFIG_H */
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
 
 #endif /* __CONFIG_H */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 12f1209..e025e02 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4061,7 +4061,6 @@ CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
 CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
 CONFIG_VID
 CONFIG_VIDEO_BCM2835
 CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
 CONFIG_VID
 CONFIG_VIDEO_BCM2835

-CONFIG_VIDEO_BMP_GZIP

 CONFIG_VIDEO_BMP_LOGO
 CONFIG_VIDEO_BMP_RLE8
 CONFIG_VIDEO_CORALP
 CONFIG_VIDEO_BMP_LOGO
 CONFIG_VIDEO_BMP_RLE8
 CONFIG_VIDEO_CORALP