GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ppc: Remove board-specific command table relocation fixups

Browse source 
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
This commit is contained in:
Peter Tyser 2009-09-21 11:20:30 -05:00 • committed by Wolfgang Denk
parent e6b05e774d
commit b5650c5d8c
5 changed files with 0 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
board/digsy_mtc/cmd_mtc.c
View file

@ -320,36 +320,6 @@ static int do_mtc_help(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
ARRAY_SIZE(cmd_mtc_sub), cmdtp, flag, argc, argv); ARRAY_SIZE(cmd_mtc_sub), cmdtp, flag, argc, argv);
} }
/* Relocate the command table function pointers when running in RAM */
int mtc_cmd_init_r(void)
{
cmd_tbl_t *cmdtp;
for (cmdtp = &cmd_mtc_sub[0]; cmdtp !=
&cmd_mtc_sub[ARRAY_SIZE(cmd_mtc_sub)]; cmdtp++) {
ulong addr;
addr = (ulong)(cmdtp->cmd) + gd->reloc_off;
cmdtp->cmd =
(int (*)(struct cmd_tbl_s *, int, int, char *[]))addr;
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
}
return 0;
}
int cmd_mtc(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int cmd_mtc(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
cmd_tbl_t *c; cmd_tbl_t *c;

2
board/digsy_mtc/digsy_mtc.c
View file

@ -240,7 +240,6 @@ void board_get_enetaddr (uchar * enet)
int misc_init_r(void) int misc_init_r(void)
{ {
extern int mtc_cmd_init_r (void);
uchar enetaddr[6]; uchar enetaddr[6];
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) { if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
@ -248,7 +247,6 @@ int misc_init_r(void)
eth_setenv_enetaddr("ethaddr", enetaddr); eth_setenv_enetaddr("ethaddr", enetaddr);
} }
mtc_cmd_init_r();
return 0; return 0;
} }

10
board/inka4x0/inka4x0.c
View file

@ -177,16 +177,6 @@ void flash_preinit(void)
clrbits_be32(&lpb->cs0_cfg, 0x1); /* clear RO */ clrbits_be32(&lpb->cs0_cfg, 0x1); /* clear RO */
} }
int misc_init_r (void) {
extern int inkadiag_init_r (void);
/*
* The command table used for the subcommands of inkadiag
* needs to be relocated manually.
*/
return inkadiag_init_r();
}
int misc_init_f (void) int misc_init_f (void)
{ {
volatile struct mpc5xxx_gpio *gpio = volatile struct mpc5xxx_gpio *gpio =

28
board/inka4x0/inkadiag.c
View file

@ -484,31 +484,3 @@ U_BOOT_CMD(inkadiag, 6, 1, do_inkadiag,
"[inkadiag what ...]\n" "[inkadiag what ...]\n"
" - perform a diagnosis on inka hardware\n" " - perform a diagnosis on inka hardware\n"
"'inkadiag' performs hardware tests."); "'inkadiag' performs hardware tests.");
/* Relocate the command table function pointers when running in RAM */
int inkadiag_init_r (void) {
cmd_tbl_t *cmdtp;
for (cmdtp = &cmd_inkadiag_sub[0]; cmdtp !=
&cmd_inkadiag_sub[ARRAY_SIZE(cmd_inkadiag_sub)]; cmdtp++) {
ulong addr;
addr = (ulong) (cmdtp->cmd) + gd->reloc_off;
cmdtp->cmd = (int (*)(struct cmd_tbl_s *, int, int, char *[]))addr;
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
}
return 0;
}

1
include/configs/inka4x0.h
View file

@ -42,7 +42,6 @@
#define BOOTFLAG_WARM 0x02 /* Software reboot */ #define BOOTFLAG_WARM 0x02 /* Software reboot */
#define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */ #define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */
#define CONFIG_MISC_INIT_R 1 /* Use misc_init_r() */
#define CONFIG_HIGH_BATS 1 /* High BATs supported */ #define CONFIG_HIGH_BATS 1 /* High BATs supported */