Convert CONFIG_VIDEO_LOGO_MAX_SIZE to Kconfig

This converts the following to Kconfig:
   CONFIG_VIDEO_LOGO_MAX_SIZE

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

diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index 4bd98d235b64a5d263af2fb3c0d89236401159d7..d7e864e83dfd76c95a186de9ed3e7687ee961aac 100644 (file)
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -126,6 +126,7 @@ CONFIG_SPLASHIMAGE_GUARD=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_SPLASH_SOURCE=y
 CONFIG_VIDEO_BMP_GZIP=y
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x200000
 CONFIG_BMP_16BPP=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
 CONFIG_IMX_WATCHDOG=y

diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 2834e479e881dc1a8f7f93fef997d6dbd7f214a9..a440bf4dd48dbed207699d0b0807c425941ff3aa 100644 (file)
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -92,5 +92,6 @@ CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000
 CONFIG_VIDEO_BMP_RLE8=y
 CONFIG_BMP_16BPP=y

diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 7da9dade3acc31e497c73f0c564f4b13240a1977..3d7027de141a7da68285878d46c408c99551009c 100644 (file)
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -97,5 +97,6 @@ CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000
 CONFIG_VIDEO_BMP_RLE8=y
 CONFIG_BMP_16BPP=y

diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 2e9be9cc66d7fd4bd828ef2fcd956babf9f66607..dd1f0584a70af0745a1e6ec83fe701fe2acbd431 100644 (file)
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -97,5 +97,6 @@ CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000
 CONFIG_VIDEO_BMP_RLE8=y
 CONFIG_BMP_16BPP=y

diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index dd513faddca0c20fe31fc02c7c61feb67644efe8..89a2fb72eb1a2169771c34efe0f5edf6d3474c90 100644 (file)
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -100,5 +100,6 @@ CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000
 CONFIG_VIDEO_BMP_RLE8=y
 CONFIG_BMP_16BPP=y

diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 9e4374cae00ee5f02d24f8e08c7d723ba8a19f3c..176e4fb800f82705cf2fb29d7c2d5bee096ccef3 100644 (file)
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -100,5 +100,6 @@ CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000
 CONFIG_VIDEO_BMP_RLE8=y
 CONFIG_BMP_16BPP=y

diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index aa28beee34538a8c299666c6e58390701419d0e7..6522a103f6cc5810356a9a78a1c4a7f93ca8658a 100644 (file)
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -97,5 +97,6 @@ CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000
 CONFIG_VIDEO_BMP_RLE8=y
 CONFIG_BMP_16BPP=y

diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index d98c213652d479bc1a9c10c279d96739a2c28ba2..dc2a8183b8308ece9fdce3d7c11e43e1a11f8342 100644 (file)
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -97,5 +97,6 @@ CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000
 CONFIG_VIDEO_BMP_RLE8=y
 CONFIG_BMP_16BPP=y

diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index c2e1b67ce6f47e174ab25d43f1892749a0531ca7..9443be7dfa9e8e763605324de2cb43f7c47e1bbb 100644 (file)
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -62,3 +62,4 @@ CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DWC2_OTG_PHY=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_FUNCTION_THOR=y
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x4e236

diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index c86c3975ff46c1da131952387f303fc729d6d473..a4417560b1c663ad2ad634e46c78f05fd099155f 100644 (file)
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -65,4 +65,5 @@ CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DWC2_OTG_PHY=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_FUNCTION_THOR=y
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x4e236
 CONFIG_LIB_HW_RAND=y

diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 9bded4cb57f5817e77ce9fd44d67957a3ac86fc1..76e2c2644e21307d691fc2e736a158ba85b6bcce 100644 (file)
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -62,4 +62,5 @@ CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DWC2_OTG_PHY=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_FUNCTION_THOR=y
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x4e236
 CONFIG_LIB_HW_RAND=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d160271abeb90b120337125fa4ff79b6e38f3624..3a692b8a3c5cabb3280ed3db4d928a2880733597 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -926,7 +926,12 @@ config VIDEO_BMP_GZIP
          splashscreen support or the bmp command.
 
 config VIDEO_LOGO_MAX_SIZE
-       bool "Maximum size of the bitmap logo in bytes"
+       hex "Maximum size of the bitmap logo in bytes"
+       default 0x100000
+       help
+         Sets the maximum uncompressed size of the logo. This is needed when
+         decompressing a BMP file using the gzip algorithm, since it cannot
+         read the size from the bitmap header.
 
 config VIDEO_BMP_RLE8
        bool "Run length encoded BMP image (RLE8) support"

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 139919f391e950ef05ecb47614585812b8cdae8b..03e1619c869b77db2ac9cff4bbac603788299f5c 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -78,11 +78,6 @@
 #define CONFIG_MXC_USB_FLAGS           0
 #endif
 
-/*
- * LCD
- */
-#define CONFIG_VIDEO_LOGO_MAX_SIZE     (2 << 20)
-
 /* LVDS display */
 #define CONFIG_SYS_LDB_CLOCK                   33260000
 #define CONFIG_IMX_VIDEO_SKIP

diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index 69d4552546f030505993e11c548c16728cfc753f..4c0531212edde30f0d2a13a29806db100f35e2ad 100644 (file)
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -15,17 +15,6 @@
 #define PHYS_SDRAM_1_SIZE              0x08000000      /* Max 128 MB RAM */
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 
-/* Environment */
-
-/* Environment is in MMC */
-
-/* USB */
-
-/* Framebuffer support */
-#ifdef CONFIG_DM_VIDEO
-#define CONFIG_VIDEO_LOGO_MAX_SIZE     (512 << 10)
-#endif
-
 /* Extra Environments */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "update_sd_firmware_filename=u-boot.sd\0" \

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 6c2fcbf7645637ceec12f6a311deba494ac7facf..140f5e98c52158a12351b5372d5bbce43ac7b8d7 100644 (file)
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -22,13 +22,6 @@
 #define        CONFIG_RTC_MXS
 #endif
 
-/* USB */
-
-/* Framebuffer support */
-#ifdef CONFIG_DM_VIDEO
-#define CONFIG_VIDEO_LOGO_MAX_SIZE     (512 << 10)
-#endif
-
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "ubifs_file=filesystem.ubifs\0" \

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index ee3c5e4afa81fb6d3e21fb99af0bc4b7c91d0d9b..d507f8f11c0d751412bfcfd6398b3c9af47c063b 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -27,7 +27,6 @@
 #define CONFIG_MXC_USB_FLAGS   0
 
 /* Framebuffer and LCD */
-#define CONFIG_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024)
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 585c67b7912c156ecb8ee72e7932a75dd77499e7..a2b62f5f6de9e575e458339139d67348ec5d1b5a 100644 (file)
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -121,6 +121,5 @@ int universal_spi_read(void);
  * LCD Settings
  */
 #define CONFIG_LD9040
-#define CONFIG_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/trats.h b/include/configs/trats.h
index 973d15962cd29ac9c8f8e78da13bb1cc7bfa9305..daa8cc79b2f22e1b89dc0abed3a04adb9c5ac991 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -147,7 +147,4 @@
 /* LCD console */
 #define LCD_BPP                        LCD_COLOR16
 
-/* LCD */
-#define CONFIG_VIDEO_LOGO_MAX_SIZE  ((500 * 160 * 4) + 54)
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 24afc220226a773046cb780f8ccc42b33e10eee2..052045a601472982a73086c62e18acd69abbb6ed 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -137,7 +137,4 @@
 /* LCD console */
 #define LCD_BPP                 LCD_COLOR16
 
-/* LCD */
-#define CONFIG_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
-
 #endif /* __CONFIG_H */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 18ccfc6047775abcb9099c71e3a15f827d4560f9..6e4b02ff37c31fe943026303e168fabb06ab56c0 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1346,7 +1346,6 @@ CONFIG_USB_TTY
 CONFIG_U_BOOT_HDR_SIZE
 CONFIG_VAR_SIZE_SPL
 CONFIG_VERY_BIG_RAM
-CONFIG_VIDEO_LOGO_MAX_SIZE
 CONFIG_VSC7385_ENET
 CONFIG_VSC7385_IMAGE
 CONFIG_VSC7385_IMAGE_SIZE