From: Peter Tyser <ptyser@xes-inc.com>
Date: Mon, 21 Sep 2009 16:20:33 +0000 (-0500)
Subject: mpl: Remove memory test relocation fixups
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=331ab60c4a418c39e5b1a05d4648a4155d0ad13e;p=u-boot.git

mpl: Remove memory test relocation fixups

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
---

diff --git a/board/mpl/common/memtst.c b/board/mpl/common/memtst.c
index 1393ea15af..92c33bac16 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 ae8eade64a..495e9bd88a 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 1b3b698ed9..e12bc423f4 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 3216d6347d..2b64f44879 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();