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>

diff --git a/common/env_common.c b/common/env_common.c
index f387f9ab91f6897acb24b1e55c204279f6e26657..1ac337730c3ec0d1f467e951497cfa1c5be16c6b 100644 (file)
--- 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);
 }
 
                                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.
 /*
  * 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;
 }
 
        return 0;
 }

-#endif

 
 void env_relocate(void)
 {
 
 void env_relocate(void)
 {