Revert "Change env_get_char from a global function ptr to a function."

This reverts commit c0559be371b2a64b1a817088c3308688e2182f93
which is known to break booting from dataflash and NAND.

diff --git a/api/api.c b/api/api.c
index 8be0485bdcfd94f7919f85c57481a07c2de56c11..1ee7c68f7afc64b74263e51c611e2604f91b291f 100644 (file)
--- a/api/api.c
+++ b/api/api.c
@@ -40,6 +40,7 @@
 
 /* U-Boot routines needed */
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+extern uchar (*env_get_char)(int);
 extern uchar *env_get_addr(int);
 
 /*****************************************************************************

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index dc05f68bfeb27b1efdfc6b832dacbcb0f1b763ed..cab727f76ca21dd9cbf79836886b24f04bd5c943 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -68,6 +68,9 @@ DECLARE_GLOBAL_DATA_PTR;
 /************************************************************************
 ************************************************************************/
 
+/* Function that returns a character from the environment */
+extern uchar (*env_get_char)(int);
+
 /* Function that returns a pointer to a value from the environment */
 /* (Only memory version supported / needed). */
 extern uchar *env_get_addr(int);

diff --git a/common/env_common.c b/common/env_common.c
index f366fdbeb2345f58d4d8b88a6a74e28273f74789..a49481244e2f7ae3c64c1829201161edee3436a1 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -50,6 +50,7 @@ extern void env_relocate_spec (void);
 extern uchar env_get_char_spec(int);
 
 static uchar env_get_char_init (int index);
+uchar (*env_get_char)(int) = env_get_char_init;
 
 /************************************************************************
  * Default settings to be used when no valid environment is found
@@ -181,19 +182,6 @@ uchar env_get_char_memory (int index)
 }
 #endif
 
-uchar env_get_char (int index)
-{
-       uchar c;
-
-       /* if relocated to RAM */
-       if (gd->flags & GD_FLG_RELOC)
-               c = env_get_char_memory(index);
-       else
-               c = env_get_char_init(index);
-
-       return (c);
-}
-
 uchar *env_get_addr (int index)
 {
        if (gd->env_valid) {
@@ -227,6 +215,11 @@ void env_relocate (void)
        DEBUGF ("%s[%d] malloced ENV at %p\n", __FUNCTION__,__LINE__,env_ptr);
 #endif
 
+       /*
+        * After relocation to RAM, we can always use the "memory" functions
+        */
+       env_get_char = env_get_char_memory;
+
        if (gd->env_valid == 0) {
 #if defined(CONFIG_GTH)        || defined(CFG_ENV_IS_NOWHERE)  /* Environment not changable */
                puts ("Using default environment\n\n");

diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index fae87ca33fe00fa5b28b0ffecb7809f1e1dfa7a9..2adc129c67799cee1ecbf7124862d4b4a1d9a1d0 100644 (file)
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -38,6 +38,7 @@ env_t *env_ptr = NULL;
 
 char * env_name_spec = "EEPROM";
 
+extern uchar (*env_get_char)(int);
 extern uchar env_get_char_memory (int index);
 
 

diff --git a/common/env_nvram.c b/common/env_nvram.c
index bfc8d02f85ba67c2262687c384314b64e4a51ca4..7c18896cb04fa88b42ec92275547eacfa1d18406 100644 (file)
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -63,6 +63,7 @@ char * env_name_spec = "NVRAM";
 extern uchar default_environment[];
 extern int default_environment_size;
 
+extern uchar (*env_get_char)(int);
 extern uchar env_get_char_memory (int index);
 
 #ifdef CONFIG_AMIGAONEG3SE

diff --git a/common/ft_build.c b/common/ft_build.c
index 0b6c2b7334760df07b7118e7bebc433d4b9e17a9..0e5699a95b84698d6adc30143ce67b5beb5db8d3 100644 (file)
--- a/common/ft_build.c
+++ b/common/ft_build.c
@@ -396,6 +396,8 @@ void *ft_get_prop(void *bphp, const char *propname, int *szp)
 
 /********************************************************************/
 
+/* Function that returns a character from the environment */
+extern uchar(*env_get_char) (int);
 
 void ft_setup(void *blob, bd_t * bd, ulong initrd_start, ulong initrd_end)
 {

diff --git a/include/common.h b/include/common.h
index a6c966cde3ef7b065ca71c7aa414750e6927302b..d0f57040ee435c627457711d264fa34682a0816e 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -227,7 +227,6 @@ extern ulong load_addr;             /* Default Load Address */
 /* common/cmd_nvedit.c */
 int    env_init     (void);
 void   env_relocate (void);
-uchar  env_get_char (int);
 int    envmatch     (uchar *, int);
 char   *getenv      (char *);
 int    getenv_r     (char *name, char *buf, unsigned len);