diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-01-14 00:27:06 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-01-14 00:27:06 +0100 |
| commit | 5f01ea63a6c263767f548b4f61880b08f7850ffc (patch) | |
| tree | cc0792e316ba56f37d72d339a2960a7d0f51b7dc /board/freescale/mpc8572ds/mpc8572ds.c | |
| parent | a9f3acbcd07da72b5446ce557531a3ed8b8beff0 (diff) | |
| parent | bae6d5e4122882fdeeefdd0358ec592c01abe138 (diff) | |
| download | u-boot-imx-5f01ea63a6c263767f548b4f61880b08f7850ffc.zip u-boot-imx-5f01ea63a6c263767f548b4f61880b08f7850ffc.tar.gz u-boot-imx-5f01ea63a6c263767f548b4f61880b08f7850ffc.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board/freescale/mpc8572ds/mpc8572ds.c')
| -rw-r--r-- | board/freescale/mpc8572ds/mpc8572ds.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index a14db5a..c2487e5 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -166,11 +166,11 @@ void pci_init_board(void) struct pci_controller *hose = &pcie3_hose; int pcie_ep = (host_agent == 0) || (host_agent == 3) || (host_agent == 5) || (host_agent == 6); - int pcie_configured = io_sel >= 1; + int pcie_configured = (io_sel == 0x7); struct pci_region *r = hose->regions; u32 temp32; - if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ + if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE3)){ printf ("\n PCIE3 connected to ULI as %s (base address %x)", pcie_ep ? "End Point" : "Root Complex", (uint)pci); @@ -234,10 +234,10 @@ void pci_init_board(void) struct pci_controller *hose = &pcie2_hose; int pcie_ep = (host_agent == 2) || (host_agent == 4) || (host_agent == 6) || (host_agent == 0); - int pcie_configured = io_sel & 4; + int pcie_configured = (io_sel == 0x3) || (io_sel == 0x7); struct pci_region *r = hose->regions; - if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ + if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE2)){ printf ("\n PCIE2 connected to Slot 1 as %s (base address %x)", pcie_ep ? "End Point" : "Root Complex", (uint)pci); @@ -287,7 +287,9 @@ void pci_init_board(void) struct pci_controller *hose = &pcie1_hose; int pcie_ep = (host_agent <= 1) || (host_agent == 4) || (host_agent == 5); - int pcie_configured = io_sel & 6; + int pcie_configured = (io_sel == 0x2) || (io_sel == 0x3) || + (io_sel == 0x7) || (io_sel == 0xb) || + (io_sel == 0xc) || (io_sel == 0xf); struct pci_region *r = hose->regions; if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ |