Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/board/ipek01/ipek01.c b/board/ipek01/ipek01.c
index d44c4bf6695bc9a8b9edd94279d6baff477b1565..2e62355c48384259399879464c221d7219cca136 100644 (file)
--- a/board/ipek01/ipek01.c
+++ b/board/ipek01/ipek01.c
@@ -195,13 +195,15 @@ void pci_init_board (void)
 }
 #endif
 
-#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
-void ft_board_setup (void *blob, bd_t * bd)
+#ifdef CONFIG_OF_BOARD_SETUP
+int ft_board_setup(void *blob, bd_t *bd)
 {
        ft_cpu_setup (blob, bd);
        fdt_fixup_memory (blob, (u64) bd->bi_memstart, (u64) bd->bi_memsize);
+
+       return 0;
 }
-#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
+#endif /* CONFIG_OF_BOARD_SETUP */
 
 int board_eth_init(bd_t *bis)
 {