From eecaba8b6cfdab1b082e84e3bdfc56a96268cb4e Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 18 Dec 2009 16:43:30 +0000 Subject: [PATCH] Clean up amd/dbm690t and kontron/986lcd-m some more (not fully). Also fix the kconfig build for HAVE_ACPI_RESUME. Signed-off-by: Patrick Georgi Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4985 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/boot/Makefile.inc | 2 +- src/mainboard/amd/dbm690t/Kconfig | 26 ++++++++++++++++++-------- src/mainboard/kontron/986lcd-m/Kconfig | 17 ++++++++++++++--- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/arch/i386/boot/Makefile.inc b/src/arch/i386/boot/Makefile.inc index 6905f9916b..e9c539f187 100644 --- a/src/arch/i386/boot/Makefile.inc +++ b/src/arch/i386/boot/Makefile.inc @@ -6,5 +6,5 @@ obj-y += tables.o obj-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpigen.o -obj-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.S +obj-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.o diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig index 098ed01caf..82b1de76a7 100644 --- a/src/mainboard/amd/dbm690t/Kconfig +++ b/src/mainboard/amd/dbm690t/Kconfig @@ -7,15 +7,15 @@ config BOARD_AMD_DBM690T select SOUTHBRIDGE_AMD_RS690 select SOUTHBRIDGE_AMD_SB600 select SUPERIO_ITE_IT8712F - select HAVE_PIRQ_TABLE - select HAVE_MP_TABLE + select GENERATE_ACPI_TABLES + select GENERATE_MP_TABLE + select GENERATE_PIRQ_TABLE + select HAVE_MAINBOARD_RESOURCES select USE_PRINTK_IN_CAR select USE_DCACHE_RAM select HAVE_HARD_RESET select IOAPIC select SB_HT_CHAIN_UNITID_OFFSET_ONLY - select WAIT_BEFORE_CPUS_INIT - select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR @@ -23,6 +23,16 @@ config MAINBOARD_DIR default amd/dbm690t depends on BOARD_AMD_DBM690T +config HAVE_HIGH_TABLES + bool + default n + depends on BOARD_AMD_DBM690T + +config HAVE_OPTION_TABLE + bool + default n + depends on BOARD_AMD_DBM690T + config DCACHE_RAM_BASE hex default 0xc8000 @@ -40,7 +50,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE config APIC_ID_OFFSET hex - default 0x8 + default 0x0 depends on BOARD_AMD_DBM690T config LB_CKS_RANGE_END @@ -80,17 +90,17 @@ config HW_MEM_HOLE_SIZE_AUTO_INC config SB_HT_CHAIN_ON_BUS0 int - default 2 + default 1 depends on BOARD_AMD_DBM690T config HT_CHAIN_END_UNITID_BASE hex - default 0x6 + default 0x1 depends on BOARD_AMD_DBM690T config HT_CHAIN_UNITID_BASE hex - default 0xa + default 0x0 depends on BOARD_AMD_DBM690T config USE_INIT diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig index 65a6895513..3fe873793f 100644 --- a/src/mainboard/kontron/986lcd-m/Kconfig +++ b/src/mainboard/kontron/986lcd-m/Kconfig @@ -6,15 +6,22 @@ config BOARD_KONTRON_986LCD_M select NORTHBRIDGE_INTEL_I945 select SOUTHBRIDGE_INTEL_I82801GX select SUPERIO_WINBOND_W83627THG - select HAVE_PIRQ_TABLE - select HAVE_MP_TABLE + select GENERATE_ACPI_TABLES + select GENERATE_PIRQ_TABLE + select GENERATE_MP_TABLE + select HAVE_ACPI_RESUME + select HAVE_HARD_RESET + select HAVE_MAINBOARD_RESOURCES select MMCONF_SUPPORT select USE_PRINTK_IN_CAR select AP_IN_SIPI_WAIT select UDELAY_LAPIC - select HAVE_ACPI_TABLES select HAVE_SMI_HANDLER select BOARD_ROMSIZE_KB_1024 + select IOAPIC + select USE_DCACHE_RAM + select GFXUMA + select HAVE_MOVNTI config MAINBOARD_DIR string @@ -66,3 +73,7 @@ config FALLBACK_VGA_BIOS_FILE default "amipci_01.20" depends on BOARD_KONTRON_986LCD_M +config HAVE_ACPI_SLIC + bool + default n + depends on BOARD_KONTRON_986LCD_M