aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/config.h14
-rw-r--r--src/pciinit.c2
2 files changed, 1 insertions, 15 deletions
diff --git a/src/config.h b/src/config.h
index e6e07c9a..687cac6e 100644
--- a/src/config.h
+++ b/src/config.h
@@ -40,23 +40,9 @@
#define BUILD_BIOS_TMP_ADDR 0x30000
#define BUILD_MAX_HIGHMEM 0xe0000000
-// Support old pci mem assignment behaviour
-//#define CONFIG_OLD_PCIMEM_ASSIGNMENT 1
-#if CONFIG_OLD_PCIMEM_ASSIGNMENT
#define BUILD_PCIMEM_START 0xf0000000
#define BUILD_PCIMEM_SIZE (BUILD_PCIMEM_END - BUILD_PCIMEM_START)
#define BUILD_PCIMEM_END 0xfec00000 /* IOAPIC is mapped at */
-#define BUILD_PCIPREFMEM_START 0
-#define BUILD_PCIPREFMEM_SIZE 0
-#define BUILD_PCIPREFMEM_END 0
-#else
-#define BUILD_PCIMEM_START 0xf0000000
-#define BUILD_PCIMEM_SIZE 0x08000000 /* half- of pci window */
-#define BUILD_PCIMEM_END (BUILD_PCIMEM_START + BUILD_PCIMEM_SIZE)
-#define BUILD_PCIPREFMEM_START BUILD_PCIMEM_END
-#define BUILD_PCIPREFMEM_SIZE (BUILD_PCIPREFMEM_END - BUILD_PCIPREFMEM_START)
-#define BUILD_PCIPREFMEM_END 0xfec00000 /* IOAPIC is mapped at */
-#endif
#define BUILD_APIC_ADDR 0xfee00000
#define BUILD_IOAPIC_ADDR 0xfec00000
diff --git a/src/pciinit.c b/src/pciinit.c
index a0e932b4..6331fdfe 100644
--- a/src/pciinit.c
+++ b/src/pciinit.c
@@ -584,7 +584,7 @@ pci_setup(void)
dprintf(3, "pci setup\n");
u32 start = BUILD_PCIMEM_START;
- u32 end = BUILD_IOAPIC_ADDR;
+ u32 end = BUILD_PCIMEM_END;
dprintf(1, "=== PCI bus & bridge init ===\n");
pci_bios_init_bus();