Author: myles Date: Mon Sep 13 15:14:48 2010 New Revision: 5803 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5803
Log: Convert i945 boards to use reserved resources instead of directly adding coreboot table entries in every mainboard. Signed-off-by: Myles Watson <[email protected]> Acked-by: Peter Stuge <[email protected]> Modified: trunk/src/mainboard/getac/p470/Kconfig trunk/src/mainboard/getac/p470/mainboard.c trunk/src/mainboard/ibase/mb899/Kconfig trunk/src/mainboard/ibase/mb899/mainboard.c trunk/src/mainboard/intel/d945gclf/Kconfig trunk/src/mainboard/intel/d945gclf/mainboard.c trunk/src/mainboard/kontron/986lcd-m/Kconfig trunk/src/mainboard/kontron/986lcd-m/mainboard.c trunk/src/mainboard/roda/rk886ex/mainboard.c trunk/src/northbridge/intel/i945/northbridge.c Modified: trunk/src/mainboard/getac/p470/Kconfig ============================================================================== --- trunk/src/mainboard/getac/p470/Kconfig Sat Sep 11 00:13:34 2010 (r5802) +++ trunk/src/mainboard/getac/p470/Kconfig Mon Sep 13 15:14:48 2010 (r5803) @@ -36,7 +36,6 @@ 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 Modified: trunk/src/mainboard/getac/p470/mainboard.c ============================================================================== --- trunk/src/mainboard/getac/p470/mainboard.c Sat Sep 11 00:13:34 2010 (r5802) +++ trunk/src/mainboard/getac/p470/mainboard.c Mon Sep 13 15:14:48 2010 (r5803) @@ -98,11 +98,6 @@ 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, Modified: trunk/src/mainboard/ibase/mb899/Kconfig ============================================================================== --- trunk/src/mainboard/ibase/mb899/Kconfig Sat Sep 11 00:13:34 2010 (r5802) +++ trunk/src/mainboard/ibase/mb899/Kconfig Mon Sep 13 15:14:48 2010 (r5803) @@ -15,7 +15,6 @@ 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 Modified: trunk/src/mainboard/ibase/mb899/mainboard.c ============================================================================== --- trunk/src/mainboard/ibase/mb899/mainboard.c Sat Sep 11 00:13:34 2010 (r5802) +++ trunk/src/mainboard/ibase/mb899/mainboard.c Mon Sep 13 15:14:48 2010 (r5803) @@ -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) { Modified: trunk/src/mainboard/intel/d945gclf/Kconfig ============================================================================== --- trunk/src/mainboard/intel/d945gclf/Kconfig Sat Sep 11 00:13:34 2010 (r5802) +++ trunk/src/mainboard/intel/d945gclf/Kconfig Mon Sep 13 15:14:48 2010 (r5803) @@ -36,7 +36,6 @@ 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 Modified: trunk/src/mainboard/intel/d945gclf/mainboard.c ============================================================================== --- trunk/src/mainboard/intel/d945gclf/mainboard.c Sat Sep 11 00:13:34 2010 (r5802) +++ trunk/src/mainboard/intel/d945gclf/mainboard.c Mon Sep 13 15:14:48 2010 (r5803) @@ -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") }; Modified: trunk/src/mainboard/kontron/986lcd-m/Kconfig ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/Kconfig Sat Sep 11 00:13:34 2010 (r5802) +++ trunk/src/mainboard/kontron/986lcd-m/Kconfig Mon Sep 13 15:14:48 2010 (r5803) @@ -15,7 +15,6 @@ 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 Modified: trunk/src/mainboard/kontron/986lcd-m/mainboard.c ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/mainboard.c Sat Sep 11 00:13:34 2010 (r5802) +++ trunk/src/mainboard/kontron/986lcd-m/mainboard.c Mon Sep 13 15:14:48 2010 (r5803) @@ -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) { Modified: trunk/src/mainboard/roda/rk886ex/mainboard.c ============================================================================== --- trunk/src/mainboard/roda/rk886ex/mainboard.c Sat Sep 11 00:13:34 2010 (r5802) +++ trunk/src/mainboard/roda/rk886ex/mainboard.c Mon Sep 13 15:14:48 2010 (r5803) @@ -134,11 +134,6 @@ #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, Modified: trunk/src/northbridge/intel/i945/northbridge.c ============================================================================== --- trunk/src/northbridge/intel/i945/northbridge.c Sat Sep 11 00:13:34 2010 (r5802) +++ trunk/src/northbridge/intel/i945/northbridge.c Mon Sep 13 15:14:48 2010 (r5803) @@ -70,20 +70,26 @@ /* 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 @@ 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 -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
