summaryrefslogtreecommitdiff
path: root/common/stdio.c
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-09-21 11:20:36 -0500
committerWolfgang Denk <wd@denx.de>2009-10-03 10:17:57 +0200
commit521af04d853361b49344b61892eb0618f9f713c5 (patch)
treeb5168e8f89074a797761a03c6bcf0c95ddfc5f12 /common/stdio.c
parent3cbcfa70b116df1bbdc90ba31c61adcaec058a8a (diff)
downloadu-boot-521af04d853361b49344b61892eb0618f9f713c5.tar.gz
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/stdio.c')
-rw-r--r--common/stdio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/common/stdio.c b/common/stdio.c
index 697df5a495..5e58dbe44b 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -201,7 +201,8 @@ int stdio_deregister(char *devname)
int stdio_init (void)
{
-#ifndef CONFIG_ARM /* already relocated for current ARM implementation */
+#if !defined(CONFIG_ARM) && !defined(CONFIG_RELOC_FIXUP_WORKS)
+ /* already relocated for current ARM implementation */
ulong relocation_offset = gd->reloc_off;
int i;
@@ -210,7 +211,7 @@ int stdio_init (void)
stdio_names[i] = (char *) (((ulong) stdio_names[i]) +
relocation_offset);
}
-#endif
+#endif /* !ARM && !CONFIG_RELOC_FIXUP_WORKS */
/* Initialize the list */
INIT_LIST_HEAD(&(devs.list));