Commit 0ed6c0f9 authored by Patrick Delaunay's avatar Patrick Delaunay Committed by Anatolij Gustschin
Browse files

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: default avatarPatrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: default avatarSimon Glass <sjg@chromium.org>
parent 76c2ff3e
...@@ -1250,12 +1250,6 @@ The following options need to be configured: ...@@ -1250,12 +1250,6 @@ The following options need to be configured:
Enables an 'i2c edid' command which can read EDID Enables an 'i2c edid' command which can read EDID
information over I2C from an attached LCD display. 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 - Run length encoded BMP image (RLE8) support: CONFIG_VIDEO_BMP_RLE8
If this option is set, 8-bit RLE compressed BMP images If this option is set, 8-bit RLE compressed BMP images
......
...@@ -104,5 +104,6 @@ CONFIG_SPLASH_SCREEN=y ...@@ -104,5 +104,6 @@ CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASHIMAGE_GUARD=y CONFIG_SPLASHIMAGE_GUARD=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_SPLASH_SOURCE=y CONFIG_SPLASH_SOURCE=y
CONFIG_VIDEO_BMP_GZIP=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=8000 CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
CONFIG_IMX_WATCHDOG=y CONFIG_IMX_WATCHDOG=y
...@@ -39,4 +39,5 @@ CONFIG_USB_EHCI_HCD=y ...@@ -39,4 +39,5 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_VIDEO_BMP_GZIP=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
...@@ -58,4 +58,5 @@ CONFIG_USB_ETHER_ASIX=y ...@@ -58,4 +58,5 @@ CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_VIDEO_BMP_GZIP=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
...@@ -58,4 +58,5 @@ CONFIG_USB_ETHER_ASIX=y ...@@ -58,4 +58,5 @@ CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_VIDEO_BMP_GZIP=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
...@@ -59,4 +59,5 @@ CONFIG_USB_ETHER_ASIX=y ...@@ -59,4 +59,5 @@ CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_VIDEO_BMP_GZIP=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
...@@ -55,4 +55,5 @@ CONFIG_USB_ETHER_ASIX=y ...@@ -55,4 +55,5 @@ CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_VIDEO_BMP_GZIP=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
...@@ -82,3 +82,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y ...@@ -82,3 +82,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
...@@ -83,3 +83,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y ...@@ -83,3 +83,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
...@@ -83,3 +83,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y ...@@ -83,3 +83,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
...@@ -85,3 +85,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y ...@@ -85,3 +85,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
...@@ -85,3 +85,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y ...@@ -85,3 +85,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
...@@ -83,3 +83,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y ...@@ -83,3 +83,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
...@@ -83,3 +83,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y ...@@ -83,3 +83,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
...@@ -939,4 +939,12 @@ config SPLASH_SOURCE ...@@ -939,4 +939,12 @@ config SPLASH_SOURCE
In case the environment variable "splashfile" is not defined the In case the environment variable "splashfile" is not defined the
default name 'splash.bmp' will be used. 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
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
* LCD * LCD
*/ */
#define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
#endif #endif
......
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
#endif #endif
......
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
/* Framebuffer and LCD */ /* Framebuffer and LCD */
#define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024)
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
......
...@@ -160,7 +160,6 @@ int universal_spi_read(void); ...@@ -160,7 +160,6 @@ int universal_spi_read(void);
*/ */
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_LD9040 #define CONFIG_LD9040
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment