diff options
| author | Peter Tyser <ptyser@xes-inc.com> | 2009-09-21 11:20:36 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-10-03 10:17:57 +0200 |
| commit | 521af04d853361b49344b61892eb0618f9f713c5 (patch) | |
| tree | b5168e8f89074a797761a03c6bcf0c95ddfc5f12 /common/hush.c | |
| parent | 3cbcfa70b116df1bbdc90ba31c61adcaec058a8a (diff) | |
| download | blackbird-obmc-uboot-521af04d853361b49344b61892eb0618f9f713c5.tar.gz blackbird-obmc-uboot-521af04d853361b49344b61892eb0618f9f713c5.zip | |
Conditionally perform common relocation fixups
Add #ifdefs where necessary to not perform relocation fixups. This
allows boards/architectures which support relocation to trim a decent
chunk of code.
Note that this patch doesn't add #ifdefs to architecture-specific code
which does not support relocation.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
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; } |
