From: Scott Wood Date: Thu, 20 Dec 2012 11:51:05 +0000 (+0000) Subject: env: don't generate callback list entries for SPL X-Git-Tag: v2013.01-rc3~12 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f8cfcf1b1c7543d5dd103359376a3319301143bc;p=u-boot env: don't generate callback list entries for SPL SPL doesn't write to the environment. These list entries prevent the functions from being garbage-collected, even though nothing will look at the list. This caused several SPL builds (e.g. P2020RDB-PC_NAND) to break due to size limitations and/or unresolved symbols. A static inline function is used to provide a context in which we can consume the callback, and thus avoid unused function warnings. Signed-off-by: Scott Wood Acked-by: Joe Hershberger Acked-by: Kim Phillips --- diff --git a/include/env_callback.h b/include/env_callback.h index 47fdc6fa91..c583120c1c 100644 --- a/include/env_callback.h +++ b/include/env_callback.h @@ -68,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__ */