Prepare v2013.01.01

[u-boot] / include / env_callback.h

diff --git a/include/env_callback.h b/include/env_callback.h
index f52e133f1fa612e8f6779398018fff6d9094e36e..c583120c1c4aea220389cbd3eedfb515a2fabdea 100644 (file)
--- a/include/env_callback.h
+++ b/include/env_callback.h
@@ -24,6 +24,7 @@
 #ifndef __ENV_CALLBACK_H__
 #define __ENV_CALLBACK_H__
 
+#include <env_flags.h>
 #include <linker_lists.h>
 #include <search.h>
 
@@ -45,6 +46,7 @@
  * a new association in the ".callbacks" environment variable.
  */
 #define ENV_CALLBACK_LIST_STATIC ENV_CALLBACK_VAR ":callbacks," \
+       ENV_FLAGS_VAR ":flags," \
        "baudrate:baudrate," \
        "bootfile:bootfile," \
        "loadaddr:loadaddr," \
@@ -66,8 +68,16 @@ void env_callback_init(ENTRY *var_entry);
  * when associated through the ".callbacks" environment variable, the callback
  * will be executed any time the variable is inserted, overwritten, or deleted.
  */
+#ifdef CONFIG_SPL_BUILD
+#define U_BOOT_ENV_CALLBACK(name, callback) \
+       static inline void _u_boot_env_noop_##name(void) \
+       { \
+               (void)callback; \
+       }
+#else
 #define U_BOOT_ENV_CALLBACK(name, callback) \
        ll_entry_declare(struct env_clbk_tbl, name, env_clbk, env_clbk) = \
        {#name, callback}
+#endif
 
 #endif /* __ENV_CALLBACK_H__ */