[PATCH 36/39] video: Drop SPLASHIMAGE_CALLBACK

[Simon Glass <sjg@chromium.org>]

This is not used anymore. Drop it.

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

 configs/m53menlo_defconfig |  1 -
 drivers/video/Kconfig      | 13 -------------
 include/env_callback.h     |  7 -------
 3 files changed, 21 deletions(-)

diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index 0e9982e7b1a..e444d16ce30 100644
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -123,7 +123,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 672f2ef9d82..eed9b357e83 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -803,19 +803,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 d5d2b2fcad6..1eae0efca2e 100644
--- 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
-- 
2.38.0.413.g74048e4d9e-goog