summaryrefslogtreecommitdiffstats
path: root/include/common.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-08-22 10:17:59 -0500
committerJon Loeliger <jdl@freescale.com>2006-08-22 10:17:59 -0500
commit4b7576fb804f9aae275a9ad5d947d2eb727d8cb7 (patch)
tree56a964216b21901d6279069086f713170805864f /include/common.h
parent5de62c47a8628b3da4d73f7c07027f32a3342d40 (diff)
parent5196a7a03bc436435787e1ad7044af94d93a5448 (diff)
downloadbarebox-4b7576fb804f9aae275a9ad5d947d2eb727d8cb7.tar.gz
barebox-4b7576fb804f9aae275a9ad5d947d2eb727d8cb7.tar.xz
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h
index 9da66b8c27..8000dd01f3 100644
--- a/include/common.h
+++ b/include/common.h
@@ -252,6 +252,9 @@ void pciinfo (int, int);
void pci_master_init (struct pci_controller *);
# endif
int is_pci_host (struct pci_controller *);
+#if defined(CONFIG_440SPE)
+ void pcie_setup_hoses(void);
+#endif
#endif
int misc_init_f (void);
@@ -474,6 +477,7 @@ void get_sys_info ( sys_info_t * );
# if defined(CONFIG_440SPE)
unsigned long determine_sysper(void);
unsigned long determine_pci_clock_per(void);
+ int ppc440spe_revB(void);
# endif
# else
typedef PPC405_SYS_INFO sys_info_t;
@@ -611,7 +615,7 @@ void show_boot_progress (int status);
#endif
#ifdef CONFIG_INIT_CRITICAL
-#error CONFIG_INIT_CRITICAL is depracted!
+#error CONFIG_INIT_CRITICAL is deprecated!
#error Read section CONFIG_SKIP_LOWLEVEL_INIT in README.
#endif