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 1393ea15af6f18140820acc697d30800f0348d46..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)) {
@@ -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)
 {