summaryrefslogtreecommitdiff
path: root/board/gdsys
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-25 11:08:52 -0500
committerTom Rini <trini@ti.com>2014-11-26 11:21:14 -0500
commit1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51 (patch)
tree9e96deb4b36a251fab92533bc6e8d7ffb58893eb /board/gdsys
parent94092e361cfa9461d746e530ca97d8822f5d23f0 (diff)
parent933cdbb479aa87dcb6e3e333c3d1e04b0e7de1ec (diff)
downloadu-boot-imx-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.zip
u-boot-imx-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.tar.gz
u-boot-imx-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.tar.bz2
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'board/gdsys')
-rw-r--r--board/gdsys/intip/intip.c4
-rw-r--r--board/gdsys/mpc8308/hrcon.c4
-rw-r--r--board/gdsys/p1022/controlcenterd.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/board/gdsys/intip/intip.c b/board/gdsys/intip/intip.c
index ee6f9e0..8d01d8b 100644
--- a/board/gdsys/intip/intip.c
+++ b/board/gdsys/intip/intip.c
@@ -206,7 +206,7 @@ int misc_init_r(void)
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
extern void __ft_board_setup(void *blob, bd_t *bd);
-void ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, bd_t *bd)
{
__ft_board_setup(blob, bd);
@@ -215,5 +215,7 @@ void ft_board_setup(void *blob, bd_t *bd)
fdt_find_and_setprop(blob, "/plb/sata@bffd1000", "status",
"disabled", sizeof("disabled"), 1);
+
+ return 0;
}
#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index a051682..e4434b3 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -531,11 +531,13 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info)
}
#if defined(CONFIG_OF_BOARD_SETUP)
-void ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, bd_t *bd)
{
ft_cpu_setup(blob, bd);
fdt_fixup_dr_usb(blob, bd);
fdt_fixup_esdhc(blob, bd);
+
+ return 0;
}
#endif
diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
index f76d968..64d90dd 100644
--- a/board/gdsys/p1022/controlcenterd.c
+++ b/board/gdsys/p1022/controlcenterd.c
@@ -326,7 +326,7 @@ int board_eth_init(bd_t *bis)
}
#ifdef CONFIG_OF_BOARD_SETUP
-void ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, bd_t *bd)
{
phys_addr_t base;
phys_size_t size;
@@ -343,6 +343,8 @@ void ft_board_setup(void *blob, bd_t *bd)
#endif
FT_FSL_PCI_SETUP;
+
+ return 0;
}
#endif