diff options
| -rw-r--r-- | src/mainboard/getac/p470/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/getac/p470/mainboard.c | 5 | ||||
| -rw-r--r-- | src/mainboard/ibase/mb899/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/ibase/mb899/mainboard.c | 5 | ||||
| -rw-r--r-- | src/mainboard/intel/d945gclf/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/intel/d945gclf/mainboard.c | 5 | ||||
| -rw-r--r-- | src/mainboard/kontron/986lcd-m/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/kontron/986lcd-m/mainboard.c | 7 | ||||
| -rw-r--r-- | src/mainboard/roda/rk886ex/mainboard.c | 5 | ||||
| -rw-r--r-- | src/northbridge/intel/i945/northbridge.c | 26 |
10 files changed, 17 insertions, 40 deletions
diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig index b258a8ba3a..720bdf559b 100644 --- a/src/mainboard/getac/p470/Kconfig +++ b/src/mainboard/getac/p470/Kconfig @@ -36,7 +36,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select HAVE_ACPI_RESUME select HAVE_ACPI_SLIC - select HAVE_MAINBOARD_RESOURCES select MMCONF_SUPPORT select AP_IN_SIPI_WAIT select UDELAY_LAPIC diff --git a/src/mainboard/getac/p470/mainboard.c b/src/mainboard/getac/p470/mainboard.c index c2e9e1831e..a861f43855 100644 --- a/src/mainboard/getac/p470/mainboard.c +++ b/src/mainboard/getac/p470/mainboard.c @@ -98,11 +98,6 @@ static void mainboard_enable(device_t dev) verb_setup(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return add_northbridge_resources(mem); -} - struct chip_operations mainboard_ops = { CHIP_NAME("Getac P470 Rugged Notebook") .enable_dev = mainboard_enable, diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig index c4fa996fba..ef910f6646 100644 --- a/src/mainboard/ibase/mb899/Kconfig +++ b/src/mainboard/ibase/mb899/Kconfig @@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select HAVE_OPTION_TABLE select HAVE_ACPI_RESUME - select HAVE_MAINBOARD_RESOURCES select MMCONF_SUPPORT select HAVE_SMI_HANDLER select BOARD_ROMSIZE_KB_512 diff --git a/src/mainboard/ibase/mb899/mainboard.c b/src/mainboard/ibase/mb899/mainboard.c index 507ca842e7..5989685ebd 100644 --- a/src/mainboard/ibase/mb899/mainboard.c +++ b/src/mainboard/ibase/mb899/mainboard.c @@ -29,11 +29,6 @@ #include <arch/coreboot_tables.h> #include "chip.h" -int add_mainboard_resources(struct lb_memory *mem) -{ - return add_northbridge_resources(mem); -} - #if CONFIG_PCI_OPTION_ROM_RUN_YABEL static int int15_handler(void) { diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig index 32a25d7fa7..f1ec575c8b 100644 --- a/src/mainboard/intel/d945gclf/Kconfig +++ b/src/mainboard/intel/d945gclf/Kconfig @@ -36,7 +36,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_MP_TABLE select HAVE_ACPI_TABLES select HAVE_ACPI_RESUME - select HAVE_MAINBOARD_RESOURCES select MMCONF_SUPPORT select HAVE_ACPI_TABLES select HAVE_SMI_HANDLER diff --git a/src/mainboard/intel/d945gclf/mainboard.c b/src/mainboard/intel/d945gclf/mainboard.c index a94b2061cd..ff08b8a6f0 100644 --- a/src/mainboard/intel/d945gclf/mainboard.c +++ b/src/mainboard/intel/d945gclf/mainboard.c @@ -23,11 +23,6 @@ #include <arch/coreboot_tables.h> #include "chip.h" -int add_mainboard_resources(struct lb_memory *mem) -{ - return add_northbridge_resources(mem); -} - struct chip_operations mainboard_ops = { CHIP_NAME("Intel D945GCLF Mainboard") }; diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig index 8a8dcb8835..15bc2dac15 100644 --- a/src/mainboard/kontron/986lcd-m/Kconfig +++ b/src/mainboard/kontron/986lcd-m/Kconfig @@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_HARD_RESET select HAVE_ACPI_RESUME - select HAVE_MAINBOARD_RESOURCES select MMCONF_SUPPORT select HAVE_SMI_HANDLER select BOARD_ROMSIZE_KB_1024 diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c index 8dcf44143b..f806ede363 100644 --- a/src/mainboard/kontron/986lcd-m/mainboard.c +++ b/src/mainboard/kontron/986lcd-m/mainboard.c @@ -20,20 +20,13 @@ #include <types.h> #include <device/device.h> #include <console/console.h> -#include <boot/tables.h> #if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> #include <arch/io.h> -#include <arch/coreboot_tables.h> #include "chip.h" -int add_mainboard_resources(struct lb_memory *mem) -{ - return add_northbridge_resources(mem); -} - #if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL static int int15_handler(void) { diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c index acfdfaa67b..f444e0aad7 100644 --- a/src/mainboard/roda/rk886ex/mainboard.c +++ b/src/mainboard/roda/rk886ex/mainboard.c @@ -134,11 +134,6 @@ static void mainboard_enable(device_t dev) #endif } -int add_mainboard_resources(struct lb_memory *mem) -{ - return add_northbridge_resources(mem); -} - struct chip_operations mainboard_ops = { CHIP_NAME("Roda Computer GmbH RK886EX Rugged Notebook (ROCKY3+)") .enable_dev = mainboard_enable, diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c index 0f5a502b69..aab82bdd4a 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -70,20 +70,26 @@ static int get_pcie_bar(u32 *base, u32 *len) /* IDG memory */ uint64_t uma_memory_base=0, uma_memory_size=0; -int add_northbridge_resources(struct lb_memory *mem) +static void add_fixed_resources(struct device *dev, int index) { + struct resource *resource; u32 pcie_config_base, pcie_config_size; printk(BIOS_DEBUG, "Adding UMA memory area\n"); - lb_add_memory_range(mem, LB_MEM_RESERVED, - uma_memory_base, uma_memory_size); - - printk(BIOS_DEBUG, "Adding PCIe config bar\n"); - get_pcie_bar(&pcie_config_base, &pcie_config_size); - lb_add_memory_range(mem, LB_MEM_RESERVED, - pcie_config_base, pcie_config_size); + resource = new_resource(dev, index); + resource->base = (resource_t) uma_memory_base; + resource->size = (resource_t) uma_memory_size; + resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | + IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; - return 0; + if (get_pcie_bar(&pcie_config_base, &pcie_config_size)) { + printk(BIOS_DEBUG, "Adding PCIe config bar\n"); + resource = new_resource(dev, index+1); + resource->base = (resource_t) pcie_config_base; + resource->size = (resource_t) pcie_config_size; + resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE | + IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; + } } static void ram_resource(device_t dev, unsigned long index, unsigned long basek, @@ -208,6 +214,8 @@ static void pci_domain_set_resources(device_t dev) ram_resource(dev, 5, 4096 * 1024, tomk - 4 * 1024 * 1024); } + add_fixed_resources(dev, 6); + assign_resources(dev->link_list); #if CONFIG_WRITE_HIGH_TABLES==1 |