projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-tq-group
[oweals/u-boot.git]
/
include
/
common.h
diff --git
a/include/common.h
b/include/common.h
index 27a660a4d69d51d8e03d17b40198a31ed55712cc..aca281bdad6ad2064011a797cd6d88118d0c9ad8 100644
(file)
--- a/
include/common.h
+++ b/
include/common.h
@@
-275,7
+275,7
@@
void pciinfo (int, int);
# endif
int is_pci_host (struct pci_controller *);
#if defined(CONFIG_440SPE)
# endif
int is_pci_host (struct pci_controller *);
#if defined(CONFIG_440SPE)
- void pcie_setup_hoses(
void
);
+ void pcie_setup_hoses(
int busno
);
#endif
#endif
#endif
#endif
@@
-434,6
+434,13
@@
int checkdcache (void);
void upmconfig (unsigned int, unsigned int *, unsigned int);
ulong get_tbclk (void);
void reset_cpu (ulong addr);
void upmconfig (unsigned int, unsigned int *, unsigned int);
ulong get_tbclk (void);
void reset_cpu (ulong addr);
+#if defined (CONFIG_OF_LIBFDT) && defined (CONFIG_OF_BOARD_SETUP)
+void ft_cpu_setup(void *blob, bd_t *bd);
+#ifdef CONFIG_PCI
+void ft_pci_setup(void *blob, bd_t *bd);
+#endif
+#endif
+
/* $(CPU)/serial.c */
int serial_init (void);
/* $(CPU)/serial.c */
int serial_init (void);