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 91c5a1a8fa37af602f258c83a890674d8bb66056..10c26717f0a30dfab7a219784b496fbe9d4e4e4f 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.
 
-- 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

diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index f68395f26de15bc7907deff6a2c9d4e66098e0ff..f32a5ba6c8cb8f612c794bfed4ef7d6cdb4f1839 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_VIDEO_BMP_GZIP=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
 CONFIG_IMX_WATCHDOG=y

diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig
index 6b89937cdbd1f6a59ef006723d2fe1549f3609e5..93b2c8badaca44b5866e477f5e6606d1bc093bce 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_VIDEO_BMP_GZIP=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig
index fe632215a90b5718e45d574d7991c26c2e3f83e9..1f3b65ff647b937b6401c502ccc561acc2abbeb4 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_VIDEO_BMP_GZIP=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index 59857774c725581725334b59d34291ed45f6f899..74c4211376e959a097749ee3ebd749fd25fe8276 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_VIDEO_BMP_GZIP=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
index 7954e03f3728888ba53fbf151a4976b1a02bf1b2..a75570c53922d0081305b1cc31de515241d74f9d 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_VIDEO_BMP_GZIP=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index 8ed9a5aeca100a578db513f7aab9f866921e0a47..fa2835e6315b7d424ef49a223cad0f4751f2ca88 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_VIDEO_BMP_GZIP=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index aeb266de3084df96c22b683b7d493149d6ba01c3..bf7509e74ed690c913adbc3fb70fdf2ffb5ec0c6 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_BMP_GZIP=y

diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index afe39436fec070be2536935a9fa5b821db3f42d8..924ad252c272cd010cc30f22a435ef5b76eae15c 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_BMP_GZIP=y

diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 610055a19a27563c2f2b7856699a7f804bffd938..bc1c9838283cbf546a2f3e4f83b646d1437a6d44 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_BMP_GZIP=y

diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index a31d4a62c2ef711be41a67d8c420e76f9bce310f..9edb40378f32f98b767192ef80200058bf8b3ce5 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_BMP_GZIP=y

diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index d6224bce8cf0806feb8fb06c5e7a215ef06860a7..63577764889b1c56cdd8d93708f17642a0c73c4e 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_BMP_GZIP=y

diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 37393e975b0a63e5e4fb6b88b1f09668a917a703..d04b221bfcb580b7d5942fc878b1b94a2b9b366a 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_BMP_GZIP=y

diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 8c8344d2c82dd5c24895a85ab8fcb937a58fd688..d5bb17b133c16083a2a7a375d43ed40616cbadce 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_BMP_GZIP=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e2e1f9c476b819c2143e2b8e1c592cfeffbf5556..63638074ca25d71d24daae145c948245ae959516 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.
 
+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

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index c15e7d22bc8c4dc6cbd3852a9afa1b0f9d745e43..f274b96f20e945cf08a967faca980989aa04a314 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -127,7 +127,6 @@
  * 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)

diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index 8f170b25297a016baf1e6d3283065d143d3153a3..bebaf5a868f8e7f02e0cd4d73a975b584cfb702c 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_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
 #endif
 

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index d65f6a900f9a6d2db98e65f15c0b5de5784ae0ee..0b71debc73d15163351eb641c93dc94a6cd84ddb 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_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
 #endif
 

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index f1780b2391a8aa0976d101b72059eff75c734ad0..ed43963bf4c6e578752997240b6eda2b1722fb06 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -57,7 +57,6 @@
 
 /* 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

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index da6ed975c3672fec349e6e5545f3c00d2b2a61f0..673797ea01b7245d7f6d89ed4faac2dfbbc4a4fb 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_VIDEO_BMP_GZIP
 #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 3202627a7dbd9a4523cd54fba2b6fd2ef980198e..acfa9fe7d982746c65193b4862cd28e4d3e14fb8 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_VIDEO_BMP_GZIP
 #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 14549dd1a0c04f8b0e650bc4b08a6c938cdfecda..06d80ce69884e880a09ca687e7c7cdf3f8b5fc52 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_VIDEO_BMP_GZIP
 #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 12f1209aa8f3f0cd0d407d76b7c42ac3e946f02c..e025e021518cba31fcb9c37e90127b6c9043102f 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_VIDEO_BMP_GZIP
 CONFIG_VIDEO_BMP_LOGO
 CONFIG_VIDEO_BMP_RLE8
 CONFIG_VIDEO_CORALP