Merge branch 'master' of /home/wd/git/u-boot/master

[karo-tx-uboot.git] / board / mpl / common / memtst.c

diff --git a/board/mpl/common/memtst.c b/board/mpl/common/memtst.c
index f0ace2a760d80f17317966eeb71a9d916eb3aaf9..68973f9cbb2f0a71c9a1446d40e55b56977b4743 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 <4xx_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);
@@ -457,7 +455,7 @@ typedef struct {
 
 
 #define TEST_STAGES 5
-const RAM_MEMTEST_FUNC test_stage[TEST_STAGES] = {
+static RAM_MEMTEST_FUNC test_stage[TEST_STAGES] = {
        {RAM_MemTest_WriteData1, "data test 1...\n", RAM_MemTest_CheckData1,
         NULL},
        {RAM_MemTest_WriteData2, "data test 2...\n", RAM_MemTest_CheckData2,
@@ -471,7 +469,6 @@ const RAM_MEMTEST_FUNC test_stage[TEST_STAGES] = {
 };
 
 
-
 int mem_test (unsigned long start, unsigned long ramsize, int quiet)
 {
        unsigned long errors, stage;