video: Drop SPLASHIMAGE_CALLBACK

This is not used anymore. Drop it.

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

diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index d7e864e83dfd76c95a186de9ed3e7687ee961aac..f68010b3bc91e8b479368df2b3cfaccadf0eb3a7 100644 (file)
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -122,7 +122,6 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_SPLASH_SCREEN=y
-CONFIG_SPLASHIMAGE_GUARD=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_SPLASH_SOURCE=y
 CONFIG_VIDEO_BMP_GZIP=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 83dba632c1b83365a8aba0666ad32987297f9133..21fda77cd6464237cc1a442459fb48aa47600a62 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -810,19 +810,6 @@ config SPLASH_SCREEN
 
 if SPLASH_SCREEN
 
-config SPLASHIMAGE_GUARD
-       bool "Support unaligned BMP images"
-       help
-         If this option is set, then U-Boot will prevent the environment
-         variable "splashimage" from being set to a problematic address
-         (see doc/README.displaying-bmps).
-
-         This option is useful for targets where, due to alignment
-         restrictions, an improperly aligned BMP image will cause a data
-         abort. If you think you will not have problems with unaligned
-         accesses (for example because your toolchain prevents them)
-         there is no need to set this option.
-
 config SPLASH_SCREEN_ALIGN
        bool "Allow positioning the splash image anywhere on the display"
        help

diff --git a/include/env_callback.h b/include/env_callback.h
index d5d2b2fcad63cff1eb41b762d51929942c8bbec1..1eae0efca2ea8236fe7f1342f12d91bcd8d795b6 100644 (file)
--- a/include/env_callback.h
+++ b/include/env_callback.h
@@ -24,12 +24,6 @@
 #define SILENT_CALLBACK
 #endif
 
-#ifdef CONFIG_SPLASHIMAGE_GUARD
-#define SPLASHIMAGE_CALLBACK "splashimage:splashimage,"
-#else
-#define SPLASHIMAGE_CALLBACK
-#endif
-
 #ifdef CONFIG_REGEX
 #define ENV_DOT_ESCAPE "\\"
 #else
@@ -74,7 +68,6 @@
        BOOTSTD_CALLBACK \
        "loadaddr:loadaddr," \
        SILENT_CALLBACK \
-       SPLASHIMAGE_CALLBACK \
        "stdin:console,stdout:console,stderr:console," \
        "serial#:serialno," \
        CONFIG_ENV_CALLBACK_LIST_STATIC