PQ2FADS: Enable PCI.
PATCH v2 1/1 PQ2FADS: Enable PCI.
PCI on PQ2FADS is very similar to PCI on MPC8272ADS.
Signed-off-by Scott Wood <[email protected]>
---
Removed an inadvertent change to an 8272ads ifdef.
cpu/mpc8260/pci.c | 2 ++ include/configs/MPC8260ADS.h | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-)
cpu/mpc8260/pci.c +2 -0
@@ -258,6 +258,8 @@ void pci_mpc8250_init (struct pci_controller *hose) immap->im_siu_conf.sc_siumcr = (immap->im_siu_conf.sc_siumcr & ~SIUMCR_LBPC11 ) |SIUMCR_LBPC01 ; +#elif defined(CONFIG_ADSTYPE ) &&CONFIG_ADSTYPE ==CONFIG_SYS_PQ2FADS +/* nothing to do for this board here */ #elif definedCONFIG_MPC8272 immap->im_siu_conf.sc_siumcr = (immap->im_siu_conf.sc_siumcr & ~SIUMCR_BBD &
include/configs/MPC8260ADS.h +13 -4
@@ -69,6 +69,13 @@#if CONFIG_ADSTYPE ==CONFIG_SYS_8272ADS #define CONFIG_MPC8272 1 +#elif CONFIG_ADSTYPE ==CONFIG_SYS_PQ2FADS +/* +* Actually MPC8275, but the code is littered with ifdefs that +* apply to both, or which use this ifdef to assume board-specific +* details. :-( +*/ +#define CONFIG_MPC8272 1#else #define CONFIG_MPC8260 1#endif /* CONFIG_ADSTYPE == CONFIG_SYS_8272ADS */
@@ -178,7 +185,7 @@#endif /* CONFIG_ADSTYPE >= CONFIG_SYS_PQ2FADS */ /*PCI*/ -#ifdef CONFIG_MPC8272 +#if CONFIG_ADSTYPE >=CONFIG_SYS_PQ2FADS #define CONFIG_PCI #define CONFIG_PCI_PNP #define CONFIG_PCI_BOOTDELAY 0
@@ -246,7 +253,6 @@#elif CONFIG_ADSTYPE >=CONFIG_SYS_PQ2FADS #undef CONFIG_CMD_SDRAM#undef CONFIG_CMD_I2C -#undef CONFIG_CMD_PCI#else #undef CONFIG_CMD_PCI
@@ -320,7 +326,7 @@#define CONFIG_SYS_IMMR 0xF0000000#define CONFIG_SYS_BCSR 0xF4500000 -#if CONFIG_ADSTYPE ==CONFIG_SYS_8272ADS +#if CONFIG_ADSTYPE >=CONFIG_SYS_PQ2FADS #define CONFIG_SYS_PCI_INT 0xF8200000#endif #define CONFIG_SYS_SDRAM_BASE 0x00000000
@@ -415,6 +421,9 @@#if CONFIG_ADSTYPE ==CONFIG_SYS_8272ADS #define CONFIG_SYS_BR3_PRELIM (CONFIG_SYS_PCI_INT | 0x1801)/* PCI interrupt controller */ #define CONFIG_SYS_OR3_PRELIM 0xFFFF8010 +#elif CONFIG_ADSTYPE ==CONFIG_SYS_PQ2FADS +#define CONFIG_SYS_BR8_PRELIM (CONFIG_SYS_PCI_INT | 0x1801)/* PCI interrupt controller */ +#define CONFIG_SYS_OR8_PRELIM 0xFFFF8010#endif #define CONFIG_SYS_RMR RMR_CSRE
@@ -449,7 +458,7 @@#define CONFIG_SYS_RESET_ADDRESS 0x04400000 -#if CONFIG_ADSTYPE ==CONFIG_SYS_8272ADS +#if CONFIG_ADSTYPE >=CONFIG_SYS_PQ2FADS /* PCI Memory map (if different from default map */ #define CONFIG_SYS_PCI_SLV_MEM_LOCAL CONFIG_SYS_SDRAM_BASE/* Local base */
Signature · 1 line
1.5.6.rc1.6.gc53ad
Wolfgang Denk
AppliedPATCH v2 1/1 PQ2FADS: Enable PCI.
Dear Scott Wood,
Quoted 9 lines · In message <[email protected]> you wrote:
PCI on PQ2FADS is very similar to PCI on MPC8272ADS.
Signed-off-by Scott Wood <[email protected]>---
Removed an inadvertent change to an 8272ads ifdef.cpu/mpc8260/pci.c | 2 ++ include/configs/MPC8260ADS.h | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "No matter where you go, there you are..." - Buckaroo Banzai