mpl: Remove memory test relocation fixups

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
master
Peter Tyser 15 years ago committed by Wolfgang Denk
parent 6385b28116
commit 331ab60c4a
  1. 26
      board/mpl/common/memtst.c
  2. 3
      board/mpl/mip405/mip405.c
  3. 2
      board/mpl/pati/pati.c
  4. 3
      board/mpl/vcma9/vcma9.c

@ -468,32 +468,6 @@ static RAM_MEMTEST_FUNC test_stage[TEST_STAGES] = {
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)
{

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

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

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

Loading…
Cancel
Save