diff options
| author | Ying Zhang <b40530@freescale.com> | 2013-06-20 16:04:24 +0800 |
|---|---|---|
| committer | York Sun <yorksun@freescale.com> | 2013-08-20 09:46:57 -0700 |
| commit | 7cb4f1cc80b1cb13e68444adee06b1741c047e36 (patch) | |
| tree | b143316613a3496ddb84fecc7e1263cea381f9d6 /common | |
| parent | 39bc12ddc36c9e30199471da0f3a929b178a04b2 (diff) | |
| download | talos-obmc-uboot-7cb4f1cc80b1cb13e68444adee06b1741c047e36.tar.gz talos-obmc-uboot-7cb4f1cc80b1cb13e68444adee06b1741c047e36.zip | |
spl: env_common.c: make CONFIG_SPL_BUILD contain function env_import
The functionality env_import will be used in the SPL. They
had been excluded by ifndef CONFIG_SPL_BUILD. Now, put it
into the SPL.
Signed-off-by: Ying Zhang <b40530@freescale.com>
Acked-by: Tom Rini <trini@ti.com>
Acked-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/env_common.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/common/env_common.c b/common/env_common.c index f387f9ab91..1ac337730c 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -140,7 +140,6 @@ int set_default_vars(int nvars, char * const vars[]) H_NOCLEAR | H_INTERACTIVE, nvars, vars); } -#ifndef CONFIG_SPL_BUILD /* * Check if CRC is valid and (if yes) import the environment. * Note that "buf" may or may not be aligned. @@ -172,7 +171,6 @@ int env_import(const char *buf, int check) return 0; } -#endif void env_relocate(void) { |
