summaryrefslogtreecommitdiffstats
path: root/board/gdsys/p1022
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/p1022
parent94092e361cfa9461d746e530ca97d8822f5d23f0 (diff)
parent933cdbb479aa87dcb6e3e333c3d1e04b0e7de1ec (diff)
downloadblackbird-obmc-uboot-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.tar.gz
blackbird-obmc-uboot-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.zip
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'board/gdsys/p1022')
-rw-r--r--board/gdsys/p1022/controlcenterd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
index f76d968962..64d90dd3fd 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
OpenPOWER on IntegriCloud