summaryrefslogtreecommitdiff
path: root/include/common.h
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-06-25 15:57:39 +0200
committerStefan Roese <sr@denx.de>2007-06-25 15:57:39 +0200
commit466fff1a7bb5fe764a06450626f6098219f446b8 (patch)
treeea3d101e2103afb8d6f16c78a8809cef1c095a46 /include/common.h
parent6f35c53166213c24a5a0e2390ed861136ff73870 (diff)
downloadu-boot-imx-466fff1a7bb5fe764a06450626f6098219f446b8.zip
u-boot-imx-466fff1a7bb5fe764a06450626f6098219f446b8.tar.gz
u-boot-imx-466fff1a7bb5fe764a06450626f6098219f446b8.tar.bz2
ppc4xx: Add pci_pre_init() for 405 boards
This patch removes the CFG_PCI_PRE_INIT option completely, since it's not needed anymore with the patch from Matthias Fuchs with the "weak" pci_pre_init() implementation. Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/common.h b/include/common.h
index 3c4b37b..d8b6b46 100644
--- a/include/common.h
+++ b/include/common.h
@@ -38,7 +38,7 @@ typedef volatile unsigned char vu_char;
#include <linux/string.h>
#include <asm/ptrace.h>
#include <stdarg.h>
-#if defined(CONFIG_PCI) && defined(CONFIG_440)
+#if defined(CONFIG_PCI) && (defined(CONFIG_4xx) && !defined(CONFIG_AP1000))
#include <pci.h>
#endif
#if defined(CONFIG_8xx)
@@ -248,10 +248,11 @@ void pci_init (void);
void pci_init_board(void);
void pciinfo (int, int);
-#if defined(CONFIG_PCI) && defined(CONFIG_440)
-# if defined(CFG_PCI_PRE_INIT)
+#if defined(CONFIG_PCI) && (defined(CONFIG_4xx) && !defined(CONFIG_AP1000))
int pci_pre_init (struct pci_controller * );
-# endif
+#endif
+
+#if defined(CONFIG_PCI) && defined(CONFIG_440)
# if defined(CFG_PCI_TARGET_INIT)
void pci_target_init (struct pci_controller *);
# endif