Changeset 3987

Timestamp:

01/30/08 23:24:41 (5 years ago)

Author:

werner

Message:

"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

File:

• trunk/src/target/u-boot/patches/loadenv.patch (modified) (5 diffs)

trunk/src/target/u-boot/patches/loadenv.patch

@@ -26 +26 @@
 --- 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);
  }
@@ -34 +34 @@
 +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);
@@ -40 +42 @@
 +       if (env_init())
 +               return 1;
-+       env_relocate();
++       env_relocate_spec();
++       gd->env_addr = (ulong) &env_ptr->data;
 +       return 0;
 +}
@@ -52 +55 @@
 +       extern char *env_name_spec;
 +
-+       printf("Environment reset to default settings ...\n");
++       printf("Environment reset to default settings\n");
 +
 +       default_env();
@@ -61 +64 @@
  
  /************************************************************************
-@@ -615,7 +641,23 @@
+@@ -615,7 +644,23 @@
         NULL
  );