diff options
| author | Tom Rini <trini@ti.com> | 2013-03-12 14:51:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-12 14:51:27 -0400 |
| commit | 49f3cef9a200614b4dad8287e2ee42f748f810c6 (patch) | |
| tree | 4e3452fd980367ebc90a68eeb8b76b592f636c23 | |
| parent | ce839172bc9db69e6f245f49b8754f1500306bd5 (diff) | |
| parent | 2a8b53ad9dc180ef000643da5fba26506508e850 (diff) | |
Merge branch 'am335x-platform-2013.01.01' into ti-u-boot-2013.01.01
| -rw-r--r-- | common/Makefile | 3 | ||||
| -rw-r--r-- | common/env_callback.c | 2 | ||||
| -rw-r--r-- | common/spl/spl.c | 12 | ||||
| -rw-r--r-- | include/env_callback.h | 1 |
4 files changed, 13 insertions, 5 deletions
diff --git a/common/Makefile b/common/Makefile index 54fcc815889..79379de735e 100644 --- a/common/Makefile +++ b/common/Makefile @@ -210,10 +210,7 @@ COBJS-y += cmd_nvedit.o COBJS-y += env_common.o COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o -COBJS-$(CONFIG_SPL_NET_SUPPORT) += cmd_nvedit.o COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_attr.o -COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_callback.o -COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_common.o COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_flags.o COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_nowhere.o COBJS-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o diff --git a/common/env_callback.c b/common/env_callback.c index 78ca3674f09..78aafb4f2c2 100644 --- a/common/env_callback.c +++ b/common/env_callback.c @@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR; /* * Look up a callback function pointer by name */ -struct env_clbk_tbl *find_env_callback(const char *name) +static struct env_clbk_tbl *find_env_callback(const char *name) { struct env_clbk_tbl *clbkp; int i; diff --git a/common/spl/spl.c b/common/spl/spl.c index 6a5a1365a14..4765e41d9c4 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -32,6 +32,7 @@ #include <image.h> #include <malloc.h> #include <linux/compiler.h> +#include <env_callback.h> DECLARE_GLOBAL_DATA_PTR; @@ -266,3 +267,14 @@ void preloader_console_init(void) spl_display_print(); #endif } + +/* + * When CONFIG_SPL_NET_SUPPORT is set, we bring in and require a large + * subset of the environment code. However, as the environment is not + * modifable interactively in this case we remove the environment + * callback support from the binary. To do so we must provide an empty + * env_callback_init function. + */ +void env_callback_init(ENTRY *var_entry) +{ +} diff --git a/include/env_callback.h b/include/env_callback.h index c583120c1c4..7a606de70b4 100644 --- a/include/env_callback.h +++ b/include/env_callback.h @@ -60,7 +60,6 @@ struct env_clbk_tbl { int flags); }; -struct env_clbk_tbl *find_env_callback(const char *); void env_callback_init(ENTRY *var_entry); /* |