diff options
| -rw-r--r-- | common/Makefile | 3 | ||||
| -rw-r--r-- | common/spl/spl.c | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/common/Makefile b/common/Makefile index 54fcc81588..79379de735 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/spl/spl.c b/common/spl/spl.c index 6a5a1365a1..4765e41d9c 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) +{ +} |