From: Ying Zhang <b40530@freescale.com>
Date: Thu, 20 Jun 2013 08:04:24 +0000 (+0800)
Subject: spl: env_common.c: make CONFIG_SPL_BUILD contain function env_import
X-Git-Tag: v2013.10-rc2~9^2~18
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7cb4f1cc80b1cb13e68444adee06b1741c047e36;p=u-boot

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 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)
 {