diff options
author | Wolfgang Denk <wd@denx.de> | 2009-08-31 22:21:47 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-08-31 22:21:47 +0200 |
commit | 3aa8b68d80dbcb6829af60485c1e388b39af793d (patch) | |
tree | b76a4e1624cfddceb5358d6221acd08a57c45b74 /board/freescale/mpc8641hpcn/mpc8641hpcn.c | |
parent | 3d35d87d5482de23cd5dc4d7721b1086107cae50 (diff) | |
parent | 2d04db088e6df8a008bb09f604876a45031df93b (diff) |
Merge branch 'next' of ../next
Diffstat (limited to 'board/freescale/mpc8641hpcn/mpc8641hpcn.c')
-rw-r--r-- | board/freescale/mpc8641hpcn/mpc8641hpcn.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index a8b2112264..fab4fae058 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -187,15 +187,11 @@ void pci_init_board(void) CONFIG_SYS_PCI1_IO_SIZE, PCI_REGION_IO); - /* inbound */ - r += fsl_pci_setup_inbound_windows(r); - hose->region_count = r - hose->regions; hose->first_busno=first_free_busno; - pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); - fsl_pci_init(hose); + fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data); first_free_busno=hose->last_busno+1; printf (" PCI-EXPRESS 1 on bus %02x - %02x\n", @@ -236,15 +232,11 @@ void pci_init_board(void) CONFIG_SYS_PCI2_IO_SIZE, PCI_REGION_IO); - /* inbound */ - r += fsl_pci_setup_inbound_windows(r); - hose->region_count = r - hose->regions; hose->first_busno=first_free_busno; - pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); - fsl_pci_init(hose); + fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data); first_free_busno=hose->last_busno+1; printf (" PCI-EXPRESS 2 on bus %02x - %02x\n", |