[commit] r4985 - in trunk/src: arch/i386/boot mainboard/amd/dbm690t mainboard/kontron/986lcd-m

Author: oxygene
Date: 2009-12-18 17:43:30 +0100 (Fri, 18 Dec 2009)
New Revision: 4985

Modified:
   trunk/src/arch/i386/boot/Makefile.inc
   trunk/src/mainboard/amd/dbm690t/Kconfig
   trunk/src/mainboard/kontron/986lcd-m/Kconfig
Log:
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

Modified: trunk/src/arch/i386/boot/Makefile.inc
===================================================================
--- trunk/src/arch/i386/boot/Makefile.inc	2009-12-18 15:29:23 UTC (rev 4984)
+++ trunk/src/arch/i386/boot/Makefile.inc	2009-12-18 16:43:30 UTC (rev 4985)
@@ -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

Modified: trunk/src/mainboard/amd/dbm690t/Kconfig
===================================================================
--- trunk/src/mainboard/amd/dbm690t/Kconfig	2009-12-18 15:29:23 UTC (rev 4984)
+++ trunk/src/mainboard/amd/dbm690t/Kconfig	2009-12-18 16:43:30 UTC (rev 4985)
@@ -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

Modified: trunk/src/mainboard/kontron/986lcd-m/Kconfig
===================================================================
--- trunk/src/mainboard/kontron/986lcd-m/Kconfig	2009-12-18 15:29:23 UTC (rev 4984)
+++ trunk/src/mainboard/kontron/986lcd-m/Kconfig	2009-12-18 16:43:30 UTC (rev 4985)
@@ -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