imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[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 2f8ab1a47873e1dfb28c8f24d7e34393a3f8456e..127374bff42240cd94a4da3f197d97bd87b21f70 100755 (executable)
--- 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... */
@@ -203,22 +208,7 @@ int checkboard (void)
        return 0;
 }
 
-
-/* ------------------------------------------------------------------------- */
-
-long int initdram (int board_type)
+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);
-}
-
-/* ------------------------------------------------------------------------- */