diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-28 20:00:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-29 21:32:07 +0200 |
| commit | 2e5167ccad93ca9cfa6a2acfab5e4785418e477e (patch) | |
| tree | 6351c567c3389ba662870eac1c74919e2d904633 /common/image.c | |
| parent | 908614f20f7f0f5df736eed21b88e81ebbf14e86 (diff) | |
| download | u-boot-imx-2e5167ccad93ca9cfa6a2acfab5e4785418e477e.zip u-boot-imx-2e5167ccad93ca9cfa6a2acfab5e4785418e477e.tar.gz u-boot-imx-2e5167ccad93ca9cfa6a2acfab5e4785418e477e.tar.bz2 | |
Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC
By now, the majority of architectures have working relocation
support, so the few remaining architectures have become exceptions.
To make this more obvious, we make working relocation now the default
case, and flag the remaining cases with CONFIG_NEEDS_MANUAL_RELOC.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Tested-by: Heiko Schocher <hs@denx.de>
Tested-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Diffstat (limited to 'common/image.c')
| -rw-r--r-- | common/image.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/image.c b/common/image.c index 89c10b8..42f5b79 100644 --- a/common/image.c +++ b/common/image.c @@ -520,7 +520,7 @@ char *get_table_entry_name (table_entry_t *table, char *msg, int id) { for (; table->id >= 0; ++table) { if (table->id == id) -#if defined(USE_HOSTCC) || defined(CONFIG_RELOC_FIXUP_WORKS) +#if defined(USE_HOSTCC) || !defined(CONFIG_NEEDS_MANUAL_RELOC) return table->lname; #else return table->lname + gd->reloc_off; @@ -585,10 +585,10 @@ int get_table_entry_id (table_entry_t *table, fprintf (stderr, "\n"); #else for (t = table; t->id >= 0; ++t) { -#ifdef CONFIG_RELOC_FIXUP_WORKS - if (t->sname && strcmp(t->sname, name) == 0) -#else +#ifdef CONFIG_NEEDS_MANUAL_RELOC if (t->sname && strcmp(t->sname + gd->reloc_off, name) == 0) +#else + if (t->sname && strcmp(t->sname, name) == 0) #endif return (t->id); } |