x86: Support machines with >4GB of RAM

[u-boot] / arch / x86 / cpu / pci.c

diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c
index f3492c3851f079703d61dd03594148eca878ff61..ab1aaaa0599e0e195f910fd3c27e2fe3c28b9b6f 100644 (file)
--- 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);
 }