diff options
author | Patrick Delaunay <patrick.delaunay@st.com> | 2020-09-28 11:30:14 +0200 |
---|---|---|
committer | Anatolij Gustschin <agust@denx.de> | 2020-10-18 15:25:28 +0200 |
commit | 0ed6c0f9cbdad600923427511a40151cdff58006 (patch) | |
tree | 8887981d312017bf1a37d0bc89cc4a5fa71db1b0 | |
parent | 76c2ff3e5fd8068b433acbb0e76d33fa5116dade (diff) | |
download | u-boot-0ed6c0f9cbdad600923427511a40151cdff58006.tar.gz |
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>
-rw-r--r-- | README | 6 | ||||
-rw-r--r-- | configs/m53menlo_defconfig | 1 | ||||
-rw-r--r-- | configs/mx23evk_defconfig | 1 | ||||
-rw-r--r-- | configs/mx28evk_auart_console_defconfig | 1 | ||||
-rw-r--r-- | configs/mx28evk_defconfig | 1 | ||||
-rw-r--r-- | configs/mx28evk_nand_defconfig | 1 | ||||
-rw-r--r-- | configs/mx28evk_spi_defconfig | 1 | ||||
-rw-r--r-- | configs/mx6qsabrelite_defconfig | 1 | ||||
-rw-r--r-- | configs/nitrogen6dl2g_defconfig | 1 | ||||
-rw-r--r-- | configs/nitrogen6dl_defconfig | 1 | ||||
-rw-r--r-- | configs/nitrogen6q2g_defconfig | 1 | ||||
-rw-r--r-- | configs/nitrogen6q_defconfig | 1 | ||||
-rw-r--r-- | configs/nitrogen6s1g_defconfig | 1 | ||||
-rw-r--r-- | configs/nitrogen6s_defconfig | 1 | ||||
-rw-r--r-- | drivers/video/Kconfig | 8 | ||||
-rw-r--r-- | include/configs/m53menlo.h | 1 | ||||
-rw-r--r-- | include/configs/mx23evk.h | 1 | ||||
-rw-r--r-- | include/configs/mx28evk.h | 1 | ||||
-rw-r--r-- | include/configs/nitrogen6x.h | 1 | ||||
-rw-r--r-- | include/configs/s5pc210_universal.h | 1 | ||||
-rw-r--r-- | include/configs/trats.h | 1 | ||||
-rw-r--r-- | include/configs/trats2.h | 1 | ||||
-rw-r--r-- | scripts/config_whitelist.txt | 1 |
23 files changed, 21 insertions, 14 deletions
@@ -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 f68395f26d..f32a5ba6c8 100644 --- 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 6b89937cdb..93b2c8bada 100644 --- 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 fe632215a9..1f3b65ff64 100644 --- 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 59857774c7..74c4211376 100644 --- 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 7954e03f37..a75570c539 100644 --- 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 8ed9a5aeca..fa2835e631 100644 --- 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 aeb266de30..bf7509e74e 100644 --- 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 afe39436fe..924ad252c2 100644 --- 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 610055a19a..bc1c983828 100644 --- 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 a31d4a62c2..9edb40378f 100644 --- 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 d6224bce8c..6357776488 100644 --- 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 37393e975b..d04b221bfc 100644 --- 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 8c8344d2c8..d5bb17b133 100644 --- 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 e2e1f9c476..63638074ca 100644 --- 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 c15e7d22bc..f274b96f20 100644 --- 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 8f170b2529..bebaf5a868 100644 --- 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 d65f6a900f..0b71debc73 100644 --- 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 f1780b2391..ed43963bf4 100644 --- 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 da6ed975c3..673797ea01 100644 --- 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 3202627a7d..acfa9fe7d9 100644 --- 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 14549dd1a0..06d80ce698 100644 --- 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 12f1209aa8..e025e02151 100644 --- 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 |