Commit 4654af27b894277c9e3dac5359f6b3e74d1405ac
1 parent
a3ad8e26a4
Exists in
master
and in
54 other branches
Fix PCI problems on PPChameleon board
Showing 8 changed files with 14 additions and 7 deletions Side-by-side Diff
CHANGELOG
board/dave/PPChameleonEVB/PPChameleonEVB.c
| ... | ... | @@ -68,7 +68,7 @@ |
| 68 | 68 | mtdcr(uicsr, 0xFFFFFFFF); /* clear all ints */ |
| 69 | 69 | mtdcr(uicer, 0x00000000); /* disable all ints */ |
| 70 | 70 | mtdcr(uiccr, 0x00000000); /* set all to be non-critical*/ |
| 71 | - mtdcr(uicpr, 0xFFFFFF81); /* set int polarities */ | |
| 71 | + mtdcr(uicpr, 0xFFFFFF80); /* set int polarities */ | |
| 72 | 72 | mtdcr(uictr, 0x10000000); /* set int trigger levels */ |
| 73 | 73 | mtdcr(uicvcr, 0x00000001); /* set vect base=0,INT0 highest priority*/ |
| 74 | 74 | mtdcr(uicsr, 0xFFFFFFFF); /* clear all ints */ |
cpu/ppc4xx/405gp_pci.c
| ... | ... | @@ -206,11 +206,14 @@ |
| 206 | 206 | *--------------------------------------------------------------------------*/ |
| 207 | 207 | out32r(PTM1LA, ptmla[0]); /* insert address */ |
| 208 | 208 | out32r(PTM1MS, ptmms[0]); /* insert size, enable bit is 1 */ |
| 209 | + pci_write_config_dword(PCIDEVID_405GP, PCI_BASE_ADDRESS_1, ptmpcila[0]); | |
| 209 | 210 | |
| 210 | 211 | /*--------------------------------------------------------------------------+ |
| 211 | 212 | * 405GP PCI Target configuration. (PTM2) |
| 212 | 213 | *--------------------------------------------------------------------------*/ |
| 213 | 214 | out32r(PTM2LA, ptmla[1]); /* insert address */ |
| 215 | + pci_write_config_dword(PCIDEVID_405GP, PCI_BASE_ADDRESS_2, ptmpcila[1]); | |
| 216 | + | |
| 214 | 217 | if (ptmms[1] == 0) |
| 215 | 218 | { |
| 216 | 219 | out32r(PTM2MS, 0x00000001); /* set enable bit */ |
| ... | ... | @@ -251,7 +254,7 @@ |
| 251 | 254 | } |
| 252 | 255 | |
| 253 | 256 | #if (CONFIG_PCI_HOST != PCI_HOST_ADAPTER) |
| 254 | -#if (CONFIG_PCI_HOSE == PCI_HOST_AUTO) | |
| 257 | +#if (CONFIG_PCI_HOST == PCI_HOST_AUTO) | |
| 255 | 258 | if (mfdcr(strap) & PSR_PCI_ARBIT_EN) |
| 256 | 259 | #endif |
| 257 | 260 | { |
doc/README.mpc85xxads
| ... | ... | @@ -4,6 +4,10 @@ |
| 4 | 4 | Created 10/15/03 |
| 5 | 5 | ----------------------------------------- |
| 6 | 6 | |
| 7 | +0. Toolchain | |
| 8 | +The Binutils in current ELDK toolchain will not support MPC85xx chip. You need | |
| 9 | +use the newest binutils-2.14.tar.bz2 from http://ftp.gnu.org/gnu/binutils. | |
| 10 | + | |
| 7 | 11 | 1. SWITCH SETTINGS & JUMPERS |
| 8 | 12 | 1.1 First, make sure the board default setting is consistent with the document |
| 9 | 13 | shipped with your board. Then apply the following changes: |
drivers/ns8382x.c
| ... | ... | @@ -321,7 +321,7 @@ |
| 321 | 321 | if ((devno = pci_find_devices(supported, idx++)) < 0) |
| 322 | 322 | break; |
| 323 | 323 | |
| 324 | - pci_read_config_dword(devno, PCI_BASE_ADDRESS_0, &iobase); | |
| 324 | + pci_read_config_dword(devno, PCI_BASE_ADDRESS_1, &iobase); | |
| 325 | 325 | iobase &= ~0x3; /* 1: unused and 0:I/O Space Indicator */ |
| 326 | 326 | |
| 327 | 327 | #ifdef NS8382X_DEBUG |
drivers/pci.c
| ... | ... | @@ -428,11 +428,9 @@ |
| 428 | 428 | dev < PCI_BDF(bus,PCI_MAX_PCI_DEVICES-1,PCI_MAX_PCI_FUNCTIONS-1); |
| 429 | 429 | dev += PCI_BDF(0,0,1)) |
| 430 | 430 | { |
| 431 | -#if ((!defined(CONFIG_405GP)) && (!defined(CONFIG_405EP))) /* don't skip host bridge on ppc405gp and 405ep */ | |
| 432 | 431 | /* Skip our host bridge */ |
| 433 | 432 | if ( dev == PCI_BDF(hose->first_busno,0,0) ) |
| 434 | 433 | continue; |
| 435 | -#endif | |
| 436 | 434 | |
| 437 | 435 | if (PCI_FUNC(dev) && !found_multi) |
| 438 | 436 | continue; |
include/configs/PPChameleonEVB.h
| ... | ... | @@ -282,7 +282,7 @@ |
| 282 | 282 | #define PCI_HOST_AUTO 2 /* detected via arbiter enable */ |
| 283 | 283 | |
| 284 | 284 | #define CONFIG_PCI /* include pci support */ |
| 285 | -#define CONFIG_PCI_HOST PCI_HOST_AUTO /* select pci host function */ | |
| 285 | +#define CONFIG_PCI_HOST PCI_HOST_FORCE /* select pci host function */ | |
| 286 | 286 | #undef CONFIG_PCI_PNP /* do pci plug-and-play */ |
| 287 | 287 | /* resource configuration */ |
| 288 | 288 |
include/configs/trab.h
| ... | ... | @@ -204,7 +204,7 @@ |
| 204 | 204 | "loadaddr=c400000\0" \ |
| 205 | 205 | "net_load=tftpboot $loadaddr $loadfile\0" \ |
| 206 | 206 | "net_nfs=run net_load nfs_args add_net add_misc;bootm\0" \ |
| 207 | - "kernel_addr=000C00000000\0" \" \ | |
| 207 | + "kernel_addr=000600000000\0" \" \ | |
| 208 | 208 | "flash_nfs=run nfs_args add_net add_misc;bootm $kernel_addr\0" \ |
| 209 | 209 | "mdm_init1=ATZ\0" \ |
| 210 | 210 | "mdm_init2=ATS0=1\0" \ |