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/hush.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/hush.c')
-rw-r--r-- | common/hush.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/common/hush.c b/common/hush.c index 528dd254a5..06c5ff8df4 100644 --- a/common/hush.c +++ b/common/hush.c @@ -3270,6 +3270,7 @@ int parse_file_outer(void) } #ifdef __U_BOOT__ +#ifndef CONFIG_RELOC_FIXUP_WORKS static void u_boot_hush_reloc(void) { unsigned long addr; @@ -3280,6 +3281,7 @@ static void u_boot_hush_reloc(void) r->literal = (char *)addr; } } +#endif int u_boot_hush_start(void) { @@ -3290,7 +3292,9 @@ int u_boot_hush_start(void) top_vars->next = 0; top_vars->flg_export = 0; top_vars->flg_read_only = 1; +#ifndef CONFIG_RELOC_FIXUP_WORKS u_boot_hush_reloc(); +#endif } return 0; } |