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 e061878b626cbefbfe442fb89c2b5421c68494d2..e7f754cd6be72ae0e649cbf164affb32d3e47397 100644 (file)
--- a/board/esd/dasa_sim/dasa_sim.c
+++ b/board/esd/dasa_sim/dasa_sim.c
@@ -74,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)... */
@@ -86,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 */
@@ -109,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 */
@@ -125,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... */
@@ -164,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;
 
@@ -204,27 +208,7 @@ int checkboard (void)
        return 0;
 }
 
-
-/* ------------------------------------------------------------------------- */
-
 phys_size_t initdram (int board_type)
 {
        return (16 * 1024 * 1024);
 }
-
-/* ------------------------------------------------------------------------- */
-
-int testdram (void)
-{
-       /* TODO: XXX XXX XXX */
-       printf ("test: 16 MB - ok\n");
-
-       return (0);
-}
-
-/* ------------------------------------------------------------------------- */
-
-int board_eth_init(bd_t *bis)
-{
-       return pci_eth_init(bis);
-}