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

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

diff --git a/board/mpl/pati/pati.c b/board/mpl/pati/pati.c
index 1b3b698ed90f776cbc44090c5079c04ae8aa5430..7f1164a5c7acdced9b3c2b790eefea0d09ae8dab 100644 (file)
--- 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;
 }
@@ -355,7 +353,7 @@ int checkboard (void)
        puts ("\nBoard: ");
        reg=in32(PLD_CONFIG_BASE+PLD_BOARD_TIMING);
        rev=(char)(SYSCNTR_BREV(reg)+'A');
-       i = getenv_r ("serial#", s, 32);
+       i = getenv_f("serial#", s, 32);
        if ((i == -1)) {
                puts ("### No HW ID - assuming " BOARD_NAME);
                printf(" Rev. %c\n",rev);