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

[u-boot] / common / env_common.c

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");