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 with git://www.denx.de/git/u-boot.git#testing-USB
[oweals/u-boot.git]
/
cpu
/
mpc8260
/
pci.c
diff --git
a/cpu/mpc8260/pci.c
b/cpu/mpc8260/pci.c
index 44576deb61d8a8ed84b8271a3640380473210d75..75c6ab298566a7eef530940300081bcc9d963bca 100644
(file)
--- a/
cpu/mpc8260/pci.c
+++ b/
cpu/mpc8260/pci.c
@@
-33,6
+33,11
@@
#include <mpc8260.h>
#include <asm/m8260_pci.h>
#include <asm/io.h>
#include <mpc8260.h>
#include <asm/m8260_pci.h>
#include <asm/io.h>
+
+#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272 || defined CONFIG_PM826
+DECLARE_GLOBAL_DATA_PTR;
+#endif
+
/*
* Local->PCI map (from CPU) controlled by
* MPC826x master window
/*
* Local->PCI map (from CPU) controlled by
* MPC826x master window
@@
-234,9
+239,6
@@
static inline void pci_outl (u32 addr, u32 data)
void pci_mpc8250_init (struct pci_controller *hose)
{
void pci_mpc8250_init (struct pci_controller *hose)
{
-#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272
- DECLARE_GLOBAL_DATA_PTR;
-#endif
u16 tempShort;
volatile immap_t *immap = (immap_t *) CFG_IMMR;
u16 tempShort;
volatile immap_t *immap = (immap_t *) CFG_IMMR;
@@
-272,7
+274,8
@@
void pci_mpc8250_init (struct pci_controller *hose)
| SIUMCR_CS10PC00
| SIUMCR_BCTLC00
| SIUMCR_MMR11;
| SIUMCR_CS10PC00
| SIUMCR_BCTLC00
| SIUMCR_MMR11;
-
+#elif defined(CONFIG_TQM8272)
+/* nothing to do for this Board here */
#else
/*
* Setting required to enable IRQ1-IRQ7 (SIUMCR [DPPC]),
#else
/*
* Setting required to enable IRQ1-IRQ7 (SIUMCR [DPPC]),
@@
-399,7
+402,7
@@
void pci_mpc8250_init (struct pci_controller *hose)
hose->last_busno = 0xff;
/* System memory space */
hose->last_busno = 0xff;
/* System memory space */
-#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272
+#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272
|| defined CONFIG_PM826
pci_set_region (hose->regions + 0,
PCI_SLV_MEM_BUS,
PCI_SLV_MEM_LOCAL,
pci_set_region (hose->regions + 0,
PCI_SLV_MEM_BUS,
PCI_SLV_MEM_LOCAL,