ppc4xx: Move ppc4xx headers to powerpc include directory

[J-u-boot.git] / board / mpl / common / memtst.c

diff --git a/board/mpl/common/memtst.c b/board/mpl/common/memtst.c
index 122ba2ecdce99645bda7068158bfd23c346d7d62..9c08065992e13f846ec0b0090bcdd58a9025ba02 100644 (file)
--- a/board/mpl/common/memtst.c
+++ b/board/mpl/common/memtst.c
@@ -29,7 +29,7 @@ int testdram (void)
        unsigned char s[32];
        int i;
 
-       i = getenv_r ("testmem", s, 32);
+       i = getenv_f("testmem", s, 32);
        if (i != 0) {
                i = (int) simple_strtoul (s, NULL, 10);
                if ((i > 0) && (i < 0xf)) {
@@ -48,15 +48,17 @@ int testdram (void)
 
 #include <common.h>
 #include <asm/processor.h>
-#include <405gp_i2c.h>
+#include <asm/ppc4xx-i2c.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 #define FALSE           0
 #define TRUE            1
 
-#define TEST_QUIET                     8
-#define TEST_SHOW_PROG         4
-#define TEST_SHOW_ERR  2
-#define TEST_SHOW_ALL          1
+#define TEST_QUIET     8
+#define TEST_SHOW_PROG 4
+#define TEST_SHOW_ERR  2
+#define TEST_SHOW_ALL  1
 
 #define TESTPAT1 0xAA55AA55
 #define TESTPAT2 0x55AA55AA
@@ -65,9 +67,6 @@ int testdram (void)
 #define MEGABYTE (1024*1024)
 
 
-
-
-
 typedef struct {
        volatile unsigned long pat1;
        volatile unsigned long pat2;
@@ -444,7 +443,6 @@ void *RAM_MemTest_Check2Addr2 (int mode, unsigned long startaddr,
 }
 
 
-
 typedef struct {
        void (*test_write) (unsigned long startaddr, unsigned long size,
                                                unsigned long *pat);
@@ -470,35 +468,8 @@ static RAM_MEMTEST_FUNC test_stage[TEST_STAGES] = {
         RAM_MemTest_CheckRandomPattern, NULL}
 };
 
-void mem_test_reloc(void)
-{
-       DECLARE_GLOBAL_DATA_PTR;
-       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 reloc)
+int mem_test (unsigned long start, unsigned long ramsize, int quiet)
 {
        unsigned long errors, stage;
        unsigned long startaddr, size, i;