Index: src/mainboard/kontron/986lcd-m/Kconfig
===================================================================
--- src/mainboard/kontron/986lcd-m/Kconfig	(revision 4982)
+++ src/mainboard/kontron/986lcd-m/Kconfig	(working copy)
@@ -6,15 +6,22 @@
 	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 @@
 	default "amipci_01.20"
 	depends on BOARD_KONTRON_986LCD_M
 
+config HAVE_ACPI_SLIC
+	bool
+	default n
+	depends on BOARD_KONTRON_986LCD_M
Index: src/mainboard/amd/dbm690t/Kconfig
===================================================================
--- src/mainboard/amd/dbm690t/Kconfig	(revision 4982)
+++ src/mainboard/amd/dbm690t/Kconfig	(working copy)
@@ -7,15 +7,15 @@
 	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 @@
 	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 APIC_ID_OFFSET
 	hex
-	default 0x8
+	default 0x0
 	depends on BOARD_AMD_DBM690T
 
 config LB_CKS_RANGE_END
@@ -80,17 +90,17 @@
 
 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
Index: src/arch/i386/boot/Makefile.inc
===================================================================
--- src/arch/i386/boot/Makefile.inc	(revision 4982)
+++ src/arch/i386/boot/Makefile.inc	(working copy)
@@ -6,5 +6,5 @@
 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