Patchwork [U-Boot,6/8,v2] spl: env_common.c: make CONFIG_SPL_BUILD contain function env_import

login
register
mail settings
Submitter ying.zhang@freescale.com
Date June 7, 2013, 9:25 a.m.
Message ID <1370597119-19401-3-git-send-email-ying.zhang@freescale.com>
Download mbox | patch
Permalink /patch/249639/
State Superseded
Delegated to: Andy Fleming
Headers show

Comments

ying.zhang@freescale.com - June 7, 2013, 9:25 a.m.
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 previous version, split into two separate patches.
this pactch only enables function env_import in SPL.

 common/env_common.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

Patch

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