diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-10-09 00:03:18 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-10-09 00:03:18 +0200 |
| commit | cd77dd109c4a439519a78c32eddc42bdebc7a61f (patch) | |
| tree | c5534647cb1786044ef0f7e4ad4067725eddf11d /common/env_common.c | |
| parent | 95c44ec485b46ffb43dbdaa299f1491a500fdadf (diff) | |
| parent | afc3ba0fc4195624e79e21244380ed7cc2fd6969 (diff) | |
| download | blackbird-obmc-uboot-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.gz blackbird-obmc-uboot-cd77dd109c4a439519a78c32eddc42bdebc7a61f.zip | |
Merge branch 'reloc'
Diffstat (limited to 'common/env_common.c')
| -rw-r--r-- | common/env_common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/common/env_common.c b/common/env_common.c index be64d1307b..439a4a905b 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -224,8 +224,10 @@ void set_default_env(void) void env_relocate (void) { +#ifndef CONFIG_RELOC_FIXUP_WORKS DEBUGF ("%s[%d] offset = 0x%lx\n", __FUNCTION__,__LINE__, gd->reloc_off); +#endif #ifdef CONFIG_AMIGAONEG3SE enable_nvram(); @@ -236,7 +238,9 @@ void env_relocate (void) * The environment buffer is embedded with the text segment, * just relocate the environment pointer */ +#ifndef CONFIG_RELOC_FIXUP_WORKS env_ptr = (env_t *)((ulong)env_ptr + gd->reloc_off); +#endif DEBUGF ("%s[%d] embedded ENV at %p\n", __FUNCTION__,__LINE__,env_ptr); #else /* |
