From: Ying Zhang b40530@freescale.com
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 --- Compared with the original version, Changed as below: 1. Split from "boot from SD card/SPI flash with SPL". 2. Split from "spl: Make CONFIG_SPL_BUILD contain more functionality" 3. No change. 4. No change.
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 906b41f..8cb81e9 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -156,7 +156,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. @@ -188,7 +187,6 @@ int env_import(const char *buf, int check)
return 0; } -#endif
void env_relocate(void) {