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/sbc8548/sbc8548.c | |
| parent | 3d35d87d5482de23cd5dc4d7721b1086107cae50 (diff) | |
| parent | 2d04db088e6df8a008bb09f604876a45031df93b (diff) | |
| download | u-boot-imx-3aa8b68d80dbcb6829af60485c1e388b39af793d.zip u-boot-imx-3aa8b68d80dbcb6829af60485c1e388b39af793d.tar.gz u-boot-imx-3aa8b68d80dbcb6829af60485c1e388b39af793d.tar.bz2 | |
Merge branch 'next' of ../next
Diffstat (limited to 'board/sbc8548/sbc8548.c')
| -rw-r--r-- | board/sbc8548/sbc8548.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 9c05c2f..1ae4cda 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -377,10 +377,6 @@ pci_init_board(void) pci_arb ? "arbiter" : "external-arbiter" ); - - /* inbound */ - r += fsl_pci_setup_inbound_windows(r); - /* outbound memory */ pci_set_region(r++, CONFIG_SYS_PCI1_MEM_BASE, @@ -403,9 +399,8 @@ pci_init_board(void) table->config_device += gd->reloc_off; 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 on bus %02x - %02x\n",hose->first_busno,hose->last_busno); #ifdef CONFIG_PCIX_CHECK @@ -462,13 +457,6 @@ pci_init_board(void) } printf ("\n"); - /* inbound */ - pci_set_region(r++, - CONFIG_SYS_PCI_MEMORY_BUS, - CONFIG_SYS_PCI_MEMORY_PHYS, - CONFIG_SYS_PCI_MEMORY_SIZE, - PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); - /* outbound memory */ pci_set_region(r++, CONFIG_SYS_PCIE1_MEM_BASE, @@ -486,9 +474,8 @@ pci_init_board(void) 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); printf ("PCIE on bus %d - %d\n",hose->first_busno,hose->last_busno); first_free_busno=hose->last_busno+1; |