diff options
| author | Heiko Schocher <hs@denx.de> | 2010-09-17 13:10:33 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-19 19:29:51 +0200 |
| commit | 620f1f6a64095ed558e68d37f1965d015cd49b02 (patch) | |
| tree | f2704340052bdeabf49dcde31f3f99cfcdc0bd24 /arch/m68k | |
| parent | 7e4a9e6dc819b2b3499659ca90e1e9c6d4ca3077 (diff) | |
| download | bootable_bootloader_goldelico_gta04-620f1f6a64095ed558e68d37f1965d015cd49b02.tar.gz bootable_bootloader_goldelico_gta04-620f1f6a64095ed558e68d37f1965d015cd49b02.tar.bz2 bootable_bootloader_goldelico_gta04-620f1f6a64095ed558e68d37f1965d015cd49b02.zip | |
relocation: fixup cmdtable
fixup_cmdtable() did all work for fixing up the cmdtable,
if CONFIG_RELOC_FIXUP_WORKS is not defined.
CONFIG_RELOC_FIXUP_WORKS is missing for i386! I talked
with Graeme Russ, and he will fix this soon.
Portions of this work were supported by funding from
the CE Linux Forum.
Signed-off-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/lib/board.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index b254079ae..acbdc5858 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -433,33 +433,14 @@ void board_init_r (gd_t *id, ulong dest_addr) monitor_flash_len = (ulong)&__init_end - dest_addr; +#if !defined(CONFIG_RELOC_FIXUP_WORKS) /* * We have to relocate the command table manually */ - for (cmdtp = &__u_boot_cmd_start; cmdtp != &__u_boot_cmd_end; cmdtp++) { - ulong addr; - addr = (ulong) (cmdtp->cmd) + gd->reloc_off; -#if 0 - printf ("Command \"%s\": 0x%08lx => 0x%08lx\n", - cmdtp->name, (ulong) (cmdtp->cmd), addr); -#endif - cmdtp->cmd = - (int (*)(struct cmd_tbl_s *, int, int, char *[]))addr; + fixup_cmdtable(&__u_boot_cmd_start, + (ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start)); +#endif /* !defined(CONFIG_RELOC_FIXUP_WORKS) */ - addr = (ulong)(cmdtp->name) + gd->reloc_off; - cmdtp->name = (char *)addr; - - if (cmdtp->usage) { - addr = (ulong)(cmdtp->usage) + gd->reloc_off; - cmdtp->usage = (char *)addr; - } -#ifdef CONFIG_SYS_LONGHELP - if (cmdtp->help) { - addr = (ulong)(cmdtp->help) + gd->reloc_off; - cmdtp->help = (char *)addr; - } -#endif - } /* there are some other pointer constants we must deal with */ #ifndef CONFIG_ENV_IS_NOWHERE env_name_spec += gd->reloc_off; |