diff options
| author | Ilya Yanok <ilya.yanok@cogentembedded.com> | 2012-09-18 00:22:50 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-01 10:02:14 -0700 |
| commit | 7ac2fe2da21d292aeaf3af74e5c80de9ce9dab56 (patch) | |
| tree | 6f85e4734fa8a41c6854c226088df4030b602050 /common/env_common.c | |
| parent | 6feb4e9db10990ed56655602de8dd08564b7c245 (diff) | |
| download | talos-obmc-uboot-7ac2fe2da21d292aeaf3af74e5c80de9ce9dab56.tar.gz talos-obmc-uboot-7ac2fe2da21d292aeaf3af74e5c80de9ce9dab56.zip | |
OMAP: networking support for SPL
This patch adds support for networking in SPL. Some devices are
capable of loading SPL via network so it makes sense to load the
main U-Boot binary via network too. This patch tries to use
existing network code as much as possible. Unfortunately, it depends
on environment which in turn depends on other code so SPL size
is increased significantly. No effort was done to decouple network
code and environment so far.
Signed-off-by: Ilya Yanok <ilya.yanok@cogentembedded.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common/env_common.c')
| -rw-r--r-- | common/env_common.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/common/env_common.c b/common/env_common.c index 3e46c260df..57221efe01 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -231,6 +231,7 @@ int set_default_vars(int nvars, char * const vars[]) nvars, vars, 1 /* do_apply */); } +#ifndef CONFIG_SPL_BUILD /* * Check if CRC is valid and (if yes) import the environment. * Note that "buf" may or may not be aligned. @@ -262,6 +263,7 @@ int env_import(const char *buf, int check) return 0; } +#endif void env_relocate(void) { @@ -269,7 +271,8 @@ void env_relocate(void) env_reloc(); #endif if (gd->env_valid == 0) { -#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment not changable */ +#if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD) + /* Environment not changable */ set_default_env(NULL); #else bootstage_error(BOOTSTAGE_ID_NET_CHECKSUM); @@ -280,7 +283,7 @@ void env_relocate(void) } } -#ifdef CONFIG_AUTO_COMPLETE +#if defined(CONFIG_AUTO_COMPLETE) && !defined(CONFIG_SPL_BUILD) int env_complete(char *var, int maxv, char *cmdv[], int bufsz, char *buf) { ENTRY *match; |
