r3987 - trunk/src/target/u-boot/patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-01-30 23:24:41 +0100 (Wed, 30 Jan 2008)
New Revision: 3987

Modified:
   trunk/src/target/u-boot/patches/loadenv.patch
Log:
"quilt refresh" before "svn commit" would help to improve the correctness
of my patches :-(

loadenv.patch:
- common/cmd_nvedit.c (do_loadenv): directly use "env_relocate_spec" and update
  gd->env_addr
- common/cmd_nvedit.c (do_defaultenv): nicer progress output




Modified: trunk/src/target/u-boot/patches/loadenv.patch
===================================================================
--- trunk/src/target/u-boot/patches/loadenv.patch	2008-01-30 21:53:09 UTC (rev 3986)
+++ trunk/src/target/u-boot/patches/loadenv.patch	2008-01-30 22:24:41 UTC (rev 3987)
@@ -25,7 +25,7 @@
 ===================================================================
 --- u-boot.orig/common/cmd_nvedit.c
 +++ u-boot/common/cmd_nvedit.c
-@@ -563,7 +563,33 @@
+@@ -563,7 +563,36 @@
  	return (saveenv() ? 1 : 0);
  }
  
@@ -33,13 +33,16 @@
 +#ifdef CONFIG_CMD_LOADENV
 +int do_loadenv(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 +{
++	extern void env_relocate_spec(void);
 +	extern char *env_name_spec;
++	extern env_t *env_ptr;
 +
 +	printf("Loading Environment from %s...\n", env_name_spec);
 +
 +	if (env_init())
 +		return 1;
-+	env_relocate();
++	env_relocate_spec();
++	gd->env_addr = (ulong) &env_ptr->data;
 +	return 0;
 +}
 +#endif /* CONFIG_CMD_LOADENV */
@@ -51,7 +54,7 @@
 +{
 +	extern char *env_name_spec;
 +
-+	printf("Environment reset to default settings ...\n");
++	printf("Environment reset to default settings\n");
 +
 +	default_env();
 +	return 0;
@@ -60,7 +63,7 @@
  
  
  /************************************************************************
-@@ -615,7 +641,23 @@
+@@ -615,7 +644,23 @@
  	NULL
  );