diff options
author | Tom Rini <trini@ti.com> | 2015-01-13 13:39:25 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-01-13 13:39:25 -0500 |
commit | 5f88ed5cde04612e5b4520327b82d81a3f5493a0 (patch) | |
tree | ae465a7b43e4a01fa4ec774f0199e86743c8d46a /arch/x86/cpu/pci.c | |
parent | 95f5c8f2269fc144fba5a21c0e9edf5311007484 (diff) | |
parent | 657e384af630463e3c8c4ffbacd16c5e46aeb0e0 (diff) | |
download | u-boot-imx-5f88ed5cde04612e5b4520327b82d81a3f5493a0.zip u-boot-imx-5f88ed5cde04612e5b4520327b82d81a3f5493a0.tar.gz u-boot-imx-5f88ed5cde04612e5b4520327b82d81a3f5493a0.tar.bz2 |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/pci.c')
-rw-r--r-- | arch/x86/cpu/pci.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c index f3492c3..ab1aaaa 100644 --- a/arch/x86/cpu/pci.c +++ b/arch/x86/cpu/pci.c @@ -15,6 +15,8 @@ #include <pci.h> #include <asm/pci.h> +DECLARE_GLOBAL_DATA_PTR; + static struct pci_controller x86_hose; int pci_early_init_hose(struct pci_controller **hosep) @@ -27,7 +29,8 @@ int pci_early_init_hose(struct pci_controller **hosep) board_pci_setup_hose(hose); pci_setup_type1(hose); - gd->arch.hose = hose; + hose->last_busno = pci_hose_scan(hose); + gd->hose = hose; *hosep = hose; return 0; @@ -48,7 +51,7 @@ void pci_init_board(void) struct pci_controller *hose = &x86_hose; /* Stop using the early hose */ - gd->arch.hose = NULL; + gd->hose = NULL; board_pci_setup_hose(hose); pci_setup_type1(hose); @@ -61,8 +64,8 @@ void pci_init_board(void) static struct pci_controller *get_hose(void) { - if (gd->arch.hose) - return gd->arch.hose; + if (gd->hose) + return gd->hose; return pci_bus_to_hose(0); } |