Merge branch 'mimc200' into next

[karo-tx-uboot.git] / board / netstal / hcu4 / hcu4.c

diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c
index dc526fcd7aa275c3ac3f9210bc0ff56089f49cd5..aa8a0975cf0c4d7107100302dae84eea54211a03 100644 (file)
--- a/board/netstal/hcu4/hcu4.c
+++ b/board/netstal/hcu4/hcu4.c
@@ -120,15 +120,6 @@ void hcu_led_set(u32 value)
        out_be32((u32 *)GPIO0_OR, tmp);
 }
 
-/*
- * sdram_init - Dummy implementation for start.S, spd_sdram  or initdram
- *             used for HCUx
- */
-void sdram_init(void)
-{
-       return;
-}
-
 /*
  * hcu_get_slot
  */
@@ -143,7 +134,7 @@ u32 hcu_get_slot(void)
  */
 u32 get_serial_number(void)
 {
-       u32 serial = in_be32((u32 *)CFG_FLASH_BASE);
+       u32 serial = in_be32((u32 *)CONFIG_SYS_FLASH_BASE);
 
        if (serial == 0xffffffff)
                return 0;
@@ -163,7 +154,7 @@ int misc_init_r(void)
        return 0;
 }
 
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
        long dram_size = 0;
        u16 boardVersReg = in_be16((u16 *)HCU_MACH_VERSIONS_REGISTER);