Merge branch 'master' of git://git.denx.de/u-boot-marvell

[karo-tx-uboot.git] / board / esd / dasa_sim / dasa_sim.c

diff --git a/board/esd/dasa_sim/dasa_sim.c b/board/esd/dasa_sim/dasa_sim.c
index def035414b53c751ee94a5ece3a8546bdf27c668..e7f754cd6be72ae0e649cbf164affb32d3e47397 100644 (file)
--- a/board/esd/dasa_sim/dasa_sim.c
+++ b/board/esd/dasa_sim/dasa_sim.c
@@ -22,6 +22,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 #include "dasa_sim.h"
 
 /* ------------------------------------------------------------------------- */
@@ -73,7 +74,8 @@ static int fpgaBoot (void)
 
 #ifdef FPGA_DEBUG
        printf ("%s\n",
-                       ((in32 (0x50000084) & 0x00010000) == 0) ? "NOT DONE" : "DONE");
+               ((in_be32 ((void *)0x50000084) & 0x00010000) == 0) ?
+               "NOT DONE" : "DONE");
 #endif
 
        /* init fpga by asserting and deasserting PROGRAM* (USER2)... */
@@ -85,7 +87,8 @@ static int fpgaBoot (void)
 
 #ifdef FPGA_DEBUG
        printf ("%s\n",
-                       ((in32 (0x50000084) & 0x00010000) == 0) ? "NOT DONE" : "DONE");
+               ((in_be32 ((void *)0x50000084) & 0x00010000) == 0) ?
+               "NOT DONE" : "DONE");
 #endif
 
        /* cs1: disable burst, disable ready */
@@ -108,7 +111,8 @@ static int fpgaBoot (void)
 
 #ifdef FPGA_DEBUG
        printf ("%s\n",
-                       ((in32 (0x50000084) & 0x00010000) == 0) ? "NOT DONE" : "DONE");
+               ((in_be32 ((void *)0x50000084) & 0x00010000) == 0) ?
+               "NOT DONE" : "DONE");
 #endif
 
        /* set cs1 to 32 bit data-width, disable burst, enable ready */
@@ -124,7 +128,8 @@ static int fpgaBoot (void)
 
 #ifdef FPGA_DEBUG
        printf ("%s\n",
-                       ((in32 (0x50000084) & 0x00010000) == 0) ? "NOT DONE" : "DONE");
+               ((in_be32 ((void *)0x50000084) & 0x00010000) == 0) ?
+               "NOT DONE" : "DONE");
 #endif
 
        /* wait for 30 ms... */
@@ -163,7 +168,7 @@ int checkboard (void)
        int index;
        int len;
        char str[64];
-       int i = getenv_r ("serial#", str, sizeof (str));
+       int i = getenv_f("serial#", str, sizeof (str));
        int fpga;
        unsigned short val;
 
@@ -202,3 +207,8 @@ int checkboard (void)
 
        return 0;
 }
+
+phys_size_t initdram (int board_type)
+{
+       return (16 * 1024 * 1024);
+}