video: Drop CONFIG_VIDEO_BMP_LOGO

This option is not implemented anymore. Drop it.

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

diff --git a/README b/README
index e88b16c500ef6470fd2abd25dcd87068dbf4e8f0..1a413bf34614d45ba043b03b697e753bcbee6e9d 100644 (file)
--- a/README
+++ b/README
@@ -980,7 +980,6 @@ The following options need to be configured:
                        CONFIG_VIDEO
                        CONFIG_VIDEO_SW_CURSOR
                        CONFIG_VGA_AS_SINGLE_DEVICE
-                       CONFIG_VIDEO_BMP_LOGO
 
                The DIU driver will look for the 'video-mode' environment
                variable, and if defined, enable the DIU as a console during

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index dfb9e9120aea4e85abb15b11e64434b005efb9bc..00fabd616342045cb350a679006e857a683e9a18 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -369,7 +369,6 @@
 #undef CONFIG_FSL_DIU_FB       /* RDB doesn't support DIU */
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x180000)
-#define CONFIG_VIDEO_BMP_LOGO
 /*
  * With CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS, flash I/O is really slow, so
  * disable empty flash sector detection, which is I/O-intensive.

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 6fbeebc1a661591935220f88655f1ca0fe977b80..16298a7eaa6394d8a7da6b10304c9d187cc0de88 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -352,7 +352,6 @@
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_FSL_DIU_CH7301
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x180000)
-#define CONFIG_VIDEO_BMP_LOGO
 #endif
 #endif
 

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index bbdcab29d8f2c5549387b8ecbf384899e239c738..ea5711dba879bcd0b698304dbfe9a8a08c5aa1d9 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -45,7 +45,6 @@
 #define CONFIG_USBD_HS
 
 /* Framebuffer and LCD */
-#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index fcf364be8df4555d7949bc08f2f4a81112debe8f..611b6d724e13ee801426c90b3a296fb4977ef812 100644 (file)
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -438,7 +438,6 @@
 /* Framebuffer */
 /* check this console not needed, after test remove it */
 #define CONFIG_IMX_VIDEO_SKIP
-#define CONFIG_VIDEO_BMP_LOGO
 
 #define CONFIG_IMX6_PWM_PER_CLK        66000000
 

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 90720c2f9b5665da8fa8d0fc6f7256e2210bade7..f836f920bd802926dfb27e60cb4bae92d09c331a 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -171,8 +171,6 @@
 /* Display */
 #define CONFIG_IMX_HDMI
 
-#define CONFIG_VIDEO_BMP_LOGO
-
 /* EEPROM */
 
 #endif /* __CONFIG_CM_FX6_H */

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 91f0f953a12c2c0523da1bcd5a90b0bf85e6d34f..53bfab499ac7cd25e3e5ab3b61cf9e5afe20d2a3 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -165,7 +165,6 @@
 
 #if defined(CONFIG_DM_VIDEO)
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
-#define CONFIG_VIDEO_BMP_LOGO
 #endif
 
 #endif /* __COLIBRI_IMX6ULL_CONFIG_H */

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 1dbc77dde1c05ba04632473a8fc115676e842a31..0d1a1bcf3df289cfdda25454a907b7ed0c5c7332 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -35,7 +35,6 @@
 #define CONFIG_USBD_HS
 
 /* Framebuffer and LCD */
-#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 92e24ea8c615aa557ebaac18e21ea53825925d11..0382724ae10130cfe4130e3c69a5c8ff1a837054 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -201,8 +201,4 @@
 
 #define CONFIG_USBD_HS
 
-#if defined(CONFIG_DM_VIDEO)
-#define CONFIG_VIDEO_BMP_LOGO
-#endif
-
 #endif

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 62f85185b761fe3f79495155918b33bea02ae925..3711e429a70370fdc1042878b721d50707b816d8 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -15,7 +15,6 @@
 #include <linux/sizes.h>
 
 #ifdef CONFIG_VIDEO_FSL_DCU_FB
-#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_SYS_FSL_DCU_LE
 
 #define CONFIG_SYS_DCU_ADDR            DCU0_BASE_ADDR

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 98fd8acda806aa07e1b5eeb91a6984823f09729a..1bf564c360656909c72090e15ac6c273ec603d5e 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -50,7 +50,6 @@
 #endif
 
 /* Framebuffer */
-#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 668d00cbc0ed203d59380c1d536d95831773efff..81582227d4e6c8c11cfef0eb966436109027faf2 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -72,7 +72,6 @@
 /* Framebuffer and LCD */
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
-#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_HIDE_LOGO_VERSION  /* Custom config to hide U-boot version */
 
 /* Miscellaneous configurable options */

diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index ff774ec54baad9a70ff4415bd2dc55207f2b976f..26d7a88ebde82958245acc1726be15dc7ae2cbcb 100644 (file)
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -152,8 +152,6 @@
 /* Framebuffer */
 #ifdef CONFIG_VIDEO_IPUV3
 # define CONFIG_IMX_VIDEO_SKIP
-
-# define CONFIG_VIDEO_BMP_LOGO
 #endif
 
 /* SPL */

diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h
index b507895a0d8bafbf6c03563f20b8904600735d9e..5c2f975ba7f0acaa3fbd1b4bab66e75e1b71fcff 100644 (file)
--- a/include/configs/imxrt1050-evk.h
+++ b/include/configs/imxrt1050-evk.h
@@ -21,8 +21,6 @@
                                         DMAMEM_SZ_ALL)
 
 #ifdef CONFIG_DM_VIDEO
-#define CONFIG_VIDEO_BMP_LOGO
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
                "stdin=serial\0" \
                "stdout=serial,vidconsole\0" \

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 91e73c7d4569d8e3d57743bf6b3ceb81f4ef8a80..4c53de9bc4b36385bb6c36cd7995ab1169072872 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -303,8 +303,6 @@
  * Video
  */
 #ifdef CONFIG_VIDEO_FSL_DCU_FB
-#define CONFIG_VIDEO_BMP_LOGO
-
 #define CONFIG_FSL_DIU_CH7301
 #define CONFIG_SYS_I2C_DVI_BUS_NUM     0
 #define CONFIG_SYS_I2C_QIXIS_ADDR      0x66

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index f5d40aa3023bc96f0d5345d9be0931df369c37c0..e1762889809dcc4ac9ff0ba12fac577db83e949c 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -193,8 +193,6 @@
  * Video
  */
 #ifdef CONFIG_VIDEO_FSL_DCU_FB
-#define CONFIG_VIDEO_BMP_LOGO
-
 #define CONFIG_FSL_DCU_SII9022A
 #define CONFIG_SYS_I2C_DVI_BUS_NUM     1
 #define CONFIG_SYS_I2C_DVI_ADDR                0x39

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 1c25857296c81eb8ae28e71d3952a602d16c52c7..832f73f05ef25364ad1f03846a6a9b2d30a067a6 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -24,7 +24,6 @@
 #endif
 
 /* Framebuffer */
-#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 4f6e385165ab079592195fdade97e4ee73b4affa..d7408e06a06063ee3e8bcfe1f644765682e0a9fa 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -151,7 +151,6 @@
 /* Environment organization */
 
 /* Framebuffer */
-#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index a46f515f10d3e1c1143a3a12adcf40031d856da0..b679d13dc045cd53298cac06059a5fe80de92d38 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -145,7 +145,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_DM_VIDEO
-#define CONFIG_VIDEO_BMP_LOGO
 #define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR
 #endif
 #endif

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 4be5d7897d88baef202a9384bb43375d858cd33d..17e7ae0b4ccabbe7c8e1f78f5315759c45632475 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -145,7 +145,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 #if defined(CONFIG_DM_VIDEO)
-#define CONFIG_VIDEO_BMP_LOGO
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
 #endif
 #endif

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index d5b38fd91dd90f01e57cb6e1624d15b197477223..d411b1a38669224f681bcfa480f11148d25a35eb 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -122,8 +122,4 @@
 
 #define CONFIG_USBD_HS
 
-#ifdef CONFIG_DM_VIDEO
-#define CONFIG_VIDEO_BMP_LOGO
-#endif
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index ac8eb0527569d1f2007a2f9c8a792f37a81f9204..28104183b541201ed44a94e9b2e85cf03ce3d43f 100644 (file)
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -41,7 +41,6 @@
 /* LCD */
 #ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_DM_VIDEO
-#define CONFIG_VIDEO_BMP_LOGO
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
 #endif
 #endif

diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 63f6b149d01fd16d8237db67b08945be398f086f..536e07b4da889d3be0454cba8eaf9ec6e668e09f 100644 (file)
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -133,7 +133,6 @@
 #define CONFIG_FEC_MXC_PHYADDR         1
 
 /* Framebuffer */
-#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index f63ebb481175a0785b5faf465a53dbff217951de..2646f19cef7c54d74604e822bc16cd7c6687e2ef 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -129,7 +129,6 @@
 #define CONFIG_BOARD_SIZE_LIMIT                715776
 
 #ifdef CONFIG_DM_VIDEO
-#define CONFIG_VIDEO_BMP_LOGO
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
 #endif
 

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index eb87073a43030381969480296af4c0d36b5d2f75..a90befc0116d17f5fc6116fd214651757a3514ad 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -119,10 +119,6 @@
 #define CONFIG_POWER_PFUZE3000
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR        0x08
 
-#ifdef CONFIG_DM_VIDEO
-#define CONFIG_VIDEO_BMP_LOGO
-#endif
-
 /* FLASH and environment organization */
 
 /* Environment starts at 768k = 768 * 1024 = 786432 */

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 753fc14ce0ed5622237b560226b7ab012e81d066..6cd7929db301221fd99a963d308145b04090ded6 100644 (file)
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -76,7 +76,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
-#define CONFIG_VIDEO_BMP_LOGO
 #define DA8XX_LCD_CNTL_BASE    LCD_CNTL_BASE
 #define PWM_TICKS      0x1388
 #define PWM_DUTY       0x200

diff --git a/include/configs/rut.h b/include/configs/rut.h
index 02d330e4f0f4315935f6dda287523047c6bb2cb3..410c6d379c31353e519d0391d4f11736a85b147c 100644 (file)
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -69,7 +69,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
-#define CONFIG_VIDEO_BMP_LOGO
 #define DA8XX_LCD_CNTL_BASE    LCD_CNTL_BASE
 
 #define BOARD_LCD_RESET                115     /* Bank 3 pin 19 */

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 80e8fe1deb2df9ffccd369a8a61f734f6a6f0c69..d44b4a0750f453b357f3efd4e559244e9de38fdc 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -31,7 +31,6 @@
 #define CONFIG_MXC_USB_FLAGS           0
 
 /* Framebuffer */
-#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 88fd64e394a8f942b5e29e69af125f8338854956..284a1efa175ae6b8b07557e0af3453480552c197 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2009,7 +2009,6 @@ CONFIG_U_BOOT_HDR_SIZE
 CONFIG_VAR_SIZE_SPL
 CONFIG_VERY_BIG_RAM
 CONFIG_VIDEO_BCM2835
-CONFIG_VIDEO_BMP_LOGO
 CONFIG_VIDEO_DA8XX
 CONFIG_VSC7385_ENET
 CONFIG_VSC7385_IMAGE