summaryrefslogtreecommitdiff
path: root/board/freescale/common
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-25 16:08:52 (GMT)
committerTom Rini <trini@ti.com>2014-11-26 16:21:14 (GMT)
commit1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51 (patch)
tree9e96deb4b36a251fab92533bc6e8d7ffb58893eb /board/freescale/common
parent94092e361cfa9461d746e530ca97d8822f5d23f0 (diff)
parent933cdbb479aa87dcb6e3e333c3d1e04b0e7de1ec (diff)
downloadu-boot-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.tar.xz
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'board/freescale/common')
-rw-r--r--board/freescale/common/cds_pci_ft.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c
index 2e5dcdf..571dfbb 100644
--- a/board/freescale/common/cds_pci_ft.c
+++ b/board/freescale/common/cds_pci_ft.c
@@ -63,13 +63,14 @@ static void cds_pci_fixup(void *blob)
}
}
-void
-ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, bd_t *bd)
{
ft_cpu_setup(blob, bd);
#ifdef CONFIG_PCI
ft_pci_setup(blob, bd);
cds_pci_fixup(blob);
#endif
+
+ return 0;
}
#endif