diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-05-12 00:40:58 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-05-12 00:40:58 +0200 |
| commit | c9dca3c3f37d2647aec4509b24b16d15882ae3e4 (patch) | |
| tree | dd61ab9cd4695c9ae3ae9dee5a58320526abf1a4 /common/env_common.c | |
| parent | 20e5ed137483823aaea5178169f3b144c7a4d9e0 (diff) | |
| download | olio-uboot-2014.01-c9dca3c3f37d2647aec4509b24b16d15882ae3e4.tar.xz olio-uboot-2014.01-c9dca3c3f37d2647aec4509b24b16d15882ae3e4.zip | |
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.
Diffstat (limited to 'common/env_common.c')
| -rw-r--r-- | common/env_common.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/common/env_common.c b/common/env_common.c index f366fdbeb..a49481244 100644 --- 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"); |