Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[karo-tx-uboot.git] / board / muas3001 / muas3001.c

diff --git a/board/muas3001/muas3001.c b/board/muas3001/muas3001.c
index 08eb5e829039d86f5395fdfdb140a23bf262327e..e0c4dbaeba583a3cae22f9fdc93296e786c1daed 100644 (file)
--- a/board/muas3001/muas3001.c
+++ b/board/muas3001/muas3001.c
@@ -243,14 +243,11 @@ phys_size_t initdram (int board_type)
        volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        volatile memctl8260_t *memctl = &immap->im_memctl;
        long psize;
-#ifndef CONFIG_SYS_RAMBOOT
        long sizelittle, sizebig;
-#endif
 
        memctl->memc_psrt = CONFIG_SYS_PSRT;
        memctl->memc_mptpr = CONFIG_SYS_MPTPR;
 
-#ifndef CONFIG_SYS_RAMBOOT
        /* 60x SDRAM setup:
         */
        sizelittle = try_init (memctl, CONFIG_SYS_PSDMR_LITTLE, CONFIG_SYS_OR1_LITTLE,
@@ -263,7 +260,6 @@ phys_size_t initdram (int board_type)
                psize = try_init (memctl, CONFIG_SYS_PSDMR_LITTLE, CONFIG_SYS_OR1_LITTLE,
                                                  (uchar *) CONFIG_SYS_SDRAM_BASE);
        }
-#endif /* CONFIG_SYS_RAMBOOT */
 
        icache_enable ();
 
@@ -329,9 +325,11 @@ void ft_blob_update (void *blob, bd_t *bd)
        }
 }
 
-void ft_board_setup (void *blob, bd_t *bd)
+int ft_board_setup(void *blob, bd_t *bd)
 {
        ft_cpu_setup (blob, bd);
        ft_blob_update (blob, bd);
+
+       return 0;
 }
 #endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */