summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-10-11 23:54:37 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-10-11 23:54:37 +0200
commit7e2a24dca9a3213f0b4941562e4387e20bec3e2d (patch)
treed04e0a5852637f365621cea6691c78d3d5e55d3d /include
parentfb883a521e04437acfe989de3e152b2e4866856b (diff)
parent7376eb87aaa601f728f9b8e5e9cd2711a67f529e (diff)
downloadblackbird-obmc-uboot-7e2a24dca9a3213f0b4941562e4387e20bec3e2d.tar.gz
blackbird-obmc-uboot-7e2a24dca9a3213f0b4941562e4387e20bec3e2d.zip
Merge with http://opensource.freescale.com/pub/scm/u-boot-85xx.git#for_wd
Diffstat (limited to 'include')
-rw-r--r--include/ft_build.h2
-rw-r--r--include/pci.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/include/ft_build.h b/include/ft_build.h
index f5156879de..89c689c084 100644
--- a/include/ft_build.h
+++ b/include/ft_build.h
@@ -64,6 +64,8 @@ void *ft_get_prop(void *bphp, const char *propname, int *szp);
#ifdef CONFIG_OF_BOARD_SETUP
void ft_board_setup(void *blob, bd_t *bd);
+void ft_cpu_setup(void *blob, bd_t *bd);
+void ft_pci_setup(void *blob, bd_t *bd);
#endif
#endif
diff --git a/include/pci.h b/include/pci.h
index e0e8783a7a..cc216e17d4 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -501,4 +501,7 @@ extern int pci_hose_config_device(struct pci_controller *hose,
extern void pci_mpc824x_init (struct pci_controller *hose);
#endif
+#ifdef CONFIG_MPC85xx
+extern void pci_mpc85xx_init (struct pci_controller *hose);
+#endif
#endif /* _PCI_H */
OpenPOWER on IntegriCloud