mpl: Remove memory test relocation fixups

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
This commit is contained in:
Peter Tyser 2009-09-21 11:20:33 -05:00 committed by Wolfgang Denk
parent 6385b28116
commit 331ab60c4a
4 changed files with 1 additions and 33 deletions

View File

@ -468,32 +468,6 @@ static RAM_MEMTEST_FUNC test_stage[TEST_STAGES] = {
RAM_MemTest_CheckRandomPattern, NULL} RAM_MemTest_CheckRandomPattern, NULL}
}; };
void mem_test_reloc(void)
{
unsigned long addr;
int i;
for (i=0; i< TEST_STAGES; i++) {
addr = (ulong) (test_stage[i].test_write) + gd->reloc_off;
test_stage[i].test_write=
(void (*) (unsigned long startaddr, unsigned long size,
unsigned long *pat))addr;
addr = (ulong) (test_stage[i].test_write_desc) + gd->reloc_off;
test_stage[i].test_write_desc=(char *)addr;
if(test_stage[i].test_check1) {
addr = (ulong) (test_stage[i].test_check1) + gd->reloc_off;
test_stage[i].test_check1=
(void *(*) (int mode, unsigned long startaddr,
unsigned long size, unsigned long *pat))addr;
}
if(test_stage[i].test_check2) {
addr = (ulong) (test_stage[i].test_check2) + gd->reloc_off;
test_stage[i].test_check2=
(void *(*) (int mode, unsigned long startaddr,
unsigned long size, unsigned long *pat))addr;
}
}
}
int mem_test (unsigned long start, unsigned long ramsize, int quiet) int mem_test (unsigned long start, unsigned long ramsize, int quiet)
{ {

View File

@ -717,7 +717,6 @@ int post_hotkeys_pressed(void)
} }
#endif #endif
extern void mem_test_reloc(void);
extern int mk_date (char *, struct rtc_time *); extern int mk_date (char *, struct rtc_time *);
int last_stage_init (void) int last_stage_init (void)
@ -725,7 +724,7 @@ int last_stage_init (void)
unsigned long stop; unsigned long stop;
struct rtc_time newtm; struct rtc_time newtm;
char *s; char *s;
mem_test_reloc();
/* write correct LED configuration */ /* write correct LED configuration */
if (miiphy_write("ppc_4xx_eth0", 0x1, 0x14, 0x2402) != 0) { if (miiphy_write("ppc_4xx_eth0", 0x1, 0x14, 0x2402) != 0) {
printf ("Error writing to the PHY\n"); printf ("Error writing to the PHY\n");

View File

@ -144,7 +144,6 @@ const sdram_t sdram_table[] = {
extern int mem_test (unsigned long start, unsigned long ramsize, int quiet); extern int mem_test (unsigned long start, unsigned long ramsize, int quiet);
extern void mem_test_reloc(void);
/* /*
* Get RAM size. * Get RAM size.
@ -334,7 +333,6 @@ void user_led1(int led_on)
****************************************************************/ ****************************************************************/
int last_stage_init (void) int last_stage_init (void)
{ {
mem_test_reloc();
init_ios(); init_ios();
return 0; return 0;
} }

View File

@ -312,11 +312,8 @@ int checkboard(void)
} }
extern void mem_test_reloc(void);
int last_stage_init(void) int last_stage_init(void)
{ {
mem_test_reloc();
checkboard(); checkboard();
stdio_print_current_devices(); stdio_print_current_devices();
check_env(); check_env();