Merge u-boot/master into u-boot-ti/master

[karo-tx-uboot.git] / include / env_callback.h

diff --git a/include/env_callback.h b/include/env_callback.h
index c583120c1c4aea220389cbd3eedfb515a2fabdea..62428d1e0c22534d147c5800389bfb05a47d1246 100644 (file)
--- a/include/env_callback.h
+++ b/include/env_callback.h
@@ -41,6 +41,12 @@
 #define SILENT_CALLBACK
 #endif
 
+#ifdef CONFIG_SPLASHIMAGE_GUARD
+#define SPLASHIMAGE_CALLBACK "splashimage:splashimage,"
+#else
+#define SPLASHIMAGE_CALLBACK
+#endif
+
 /*
  * This list of callback bindings is static, but may be overridden by defining
  * a new association in the ".callbacks" environment variable.
@@ -51,6 +57,7 @@
        "bootfile:bootfile," \
        "loadaddr:loadaddr," \
        SILENT_CALLBACK \
+       SPLASHIMAGE_CALLBACK \
        "stdin:console,stdout:console,stderr:console," \
        CONFIG_ENV_CALLBACK_LIST_STATIC