diff options
| author | Peter Tyser <ptyser@xes-inc.com> | 2009-09-21 11:20:33 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-10-03 10:17:56 +0200 |
| commit | 331ab60c4a418c39e5b1a05d4648a4155d0ad13e (patch) | |
| tree | 063c707388c9756a043161dbb4ef1f1ffbcc48e0 /board/mpl | |
| parent | 6385b28116f775da4771b768ba9bf93c3aaaf26e (diff) | |
| download | u-boot-imx-331ab60c4a418c39e5b1a05d4648a4155d0ad13e.zip u-boot-imx-331ab60c4a418c39e5b1a05d4648a4155d0ad13e.tar.gz u-boot-imx-331ab60c4a418c39e5b1a05d4648a4155d0ad13e.tar.bz2 | |
mpl: Remove memory test relocation fixups
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'board/mpl')
| -rw-r--r-- | board/mpl/common/memtst.c | 26 | ||||
| -rw-r--r-- | board/mpl/mip405/mip405.c | 3 | ||||
| -rw-r--r-- | board/mpl/pati/pati.c | 2 | ||||
| -rw-r--r-- | board/mpl/vcma9/vcma9.c | 3 |
4 files changed, 1 insertions, 33 deletions
diff --git a/board/mpl/common/memtst.c b/board/mpl/common/memtst.c index 1393ea1..92c33ba 100644 --- a/board/mpl/common/memtst.c +++ b/board/mpl/common/memtst.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) { diff --git a/board/mpl/mip405/mip405.c b/board/mpl/mip405/mip405.c index ae8eade..495e9bd 100644 --- a/board/mpl/mip405/mip405.c +++ b/board/mpl/mip405/mip405.c @@ -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"); diff --git a/board/mpl/pati/pati.c b/board/mpl/pati/pati.c index 1b3b698..e12bc42 100644 --- a/board/mpl/pati/pati.c +++ b/board/mpl/pati/pati.c @@ -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; } diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c index 3216d63..2b64f44 100644 --- a/board/mpl/vcma9/vcma9.c +++ b/board/mpl/vcma9/vcma9.c @@ -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(); |