smdk6400: Use CONFIG_FLASH_CFI_DRIVER

[u-boot] / board / w7o / w7o.c

diff --git a/board/w7o/w7o.c b/board/w7o/w7o.c
index daf7f53fcd97d0f84c8ac2f2d4120fdc150e349a..0e3b84c61348f047882d7b6971dc8129696c868e 100644 (file)
--- a/board/w7o/w7o.c
+++ b/board/w7o/w7o.c
@@ -31,6 +31,7 @@
 #include <watchdog.h>
 
 unsigned long get_dram_size (void);
+void sdram_init(void);
 
 /*
  * Macros to transform values
@@ -151,8 +152,15 @@ int checkboard (void)
 
 /* ------------------------------------------------------------------------- */
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
+       /*
+        * ToDo: Move the asm init routine sdram_init() to this C file,
+        * or even better use some common ppc4xx code available
+        * in cpu/ppc4xx
+        */
+       sdram_init();
+
        return get_dram_size ();
 }
 
@@ -207,8 +215,8 @@ static void w7o_env_init (VPD * vpd)
             (strncmp (vpd->productId, "CMM", 3) == 0))) {
                char buf[30];
                char *eth;
-               unsigned char *serial = getenv ("serial#");
-               unsigned char *ethaddr = getenv ("ethaddr");
+               char *serial = getenv ("serial#");
+               char *ethaddr = getenv ("ethaddr");
 
                /* Set 'serial#' envvar if serial# isn't set */
                if (!serial) {
@@ -218,7 +226,7 @@ static void w7o_env_init (VPD * vpd)
                }
 
                /* Set 'ethaddr' envvar if 'ethaddr' envvar is the default */
-               eth = vpd->ethAddrs[0];
+               eth = (char *)(vpd->ethAddrs[0]);
                if (ethaddr
                    && (strcmp (ethaddr, MK_STR (CONFIG_ETHADDR)) == 0)) {
                        /* Now setup ethaddr */