Skip to contentSkip to conversation

common/env: Point default envirenoment for GD

PATCH Superseded Prabhakar Kushwaha 2 participants 2 messages Oct 25, 2013 – Nov 6, 2013

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 3/6 common/env: Point default envirenoment for GD

GD(Global Data) structure has pointer to envirenoment variable array. but, it is not being assigned for SPL framwork.

So update GD pointer with env variable array.

---
Based upon git://git.denx.de/u-boot-mpc85xx.git branch next

Changes for v2: Incorporated York's comments
- fix compile warning

 common/env_common.c |    3 +++
 1 file changed, 3 insertions(+)
common/env_common.c +3 -0
index c0bfc2f..ce95c1a 100644
@@ -162,6 +162,9 @@ int env_import(const char *buf, int check)
 	if (himport_r(&env_htab, (char *)ep->data, ENV_SIZE, '\0', 0,
 			0, NULL)) {
 		gd->flags |= GD_FLG_ENV_READY;
+#ifdef CONFIG_SPL_BUILD
+		gd->env_addr = (u32)ep->data;
+#endif
 		return 1;
 	}
 
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 3/6 common/env: Point default envirenoment for GD

Quoted 20 lines · Prabhakar Kushwaha

GD(Global Data) structure has pointer to envirenoment variable array. but, it is not being assigned for SPL framwork.

So update GD pointer with env variable array.

---
Based upon git://git.denx.de/u-boot-mpc85xx.git branch next

Changes for v2: Incorporated York's comments
- fix compile warning

 common/env_common.c |    3 +++
 1 file changed, 3 insertions(+)
common/env_common.c +0 -0
index c0bfc2f..ce95c1a 100644

common/env_common.c int env_import(const char *buf, int check) · line 167

Quoted 6 lines
common/env_common.c +3 -0
@@ -162,6 +162,9 @@ int env_import(const char *buf, int check)
 	if (himport_r(&env_htab, (char *)ep->data, ENV_SIZE, '\0', 0,
 			0, NULL)) {
 		gd->flags |= GD_FLG_ENV_READY;
+#ifdef CONFIG_SPL_BUILD
+		gd->env_addr = (u32)ep->data;
+#endif

s/u32/unsigned long/

Is this a problem with all environment-using SPLs, or is this covering up for something we're doing wrong in a particular target?

-Scott