8 files changed, 85 insertions, 61 deletions

diff --git a/src/Kconfig b/src/Kconfig
index 225ef2ec9f..f76a40d7c3 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -40,13 +40,9 @@ config CBFS
 	bool
 	default y
 
-config HAVE_HIGH_TABLES
-	bool
-	default y
-
 config PCI_BUS_SEGN_BITS
-	int
-	default 0
+	bool
+	default n
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
@@ -81,20 +77,20 @@ config LB_CKS_LOC
 	default 126
 
 config LOGICAL_CPUS
-	int
-	default 1
+	bool
+	default y
 
 config PCI_ROM_RUN
 	bool
 	default n
 
 config HT_CHAIN_UNITID_BASE
-	int
+	hex
 	default 1
 
 config HT_CHAIN_END_UNITID_BASE
-	int
-	default 32
+	hex
+	default 0x20
 
 config HEAP_SIZE
 	hex
@@ -136,10 +132,6 @@ config LB_MEM_TOPK
 	int
 	default 2048
 
-config MULTIBOOT
-	bool
-	default n
-
 config COMPRESSED_PAYLOAD_LZMA
 	bool
 	default y
@@ -158,10 +150,6 @@ config ACPI_SSDTX_NUM
 	int
 	default 0
 
-config HAVE_ACPI_TABLES
-	bool
-	default n
-
 config HAVE_FALLBACK_BOOT
 	bool
 	default y
@@ -186,18 +174,10 @@ config HAVE_MOVNTI
 	bool
 	default y
 
-config HAVE_MP_TABLE
-	bool
-	default n
-
 config HAVE_OPTION_TABLE
 	bool
 	default y
 
-config HAVE_PIRQ_TABLE
-	bool
-	default n
-
 config PIRQ_ROUTE
 	bool
 	default n
@@ -214,11 +194,55 @@ config IOAPIC
 	bool
 	default n
 
+config USE_WATCHDOG_ON_BOOT
+	bool
+	default n
+
+config VGA
+	bool
+	default n
+	help
+	  Build board-specific VGA code.
+
+config GFXUMA
+	bool
+	default n
+	help
+	  Enable Unified Memory Architecture for graphics.
+
 # TODO
 # menu "Drivers"
 # 
 # endmenu
 
+menu "Generated System Tables"
+
+config HAVE_LOW_TABLES
+	bool
+	default y
+
+config HAVE_HIGH_TABLES
+	bool "Write 'high' tables to avoid being overwritten in F segment"
+	default y
+
+config MULTIBOOT
+	bool "Add Multiboot tables (for grub2)"
+	default n
+
+config HAVE_ACPI_TABLES
+	bool "Generate ACPI tables"
+	default n
+
+config HAVE_MP_TABLE
+	bool "Generate an MP table"
+	default n
+
+config HAVE_PIRQ_TABLE
+	bool "Generate a PIRQ table"
+	default n
+
+endmenu
+
 menu "Payload"
 
 config COMPRESSED_PAYLOAD_LZMA
diff --git a/src/console/Kconfig b/src/console/Kconfig
index d4acf51a7d..ed3a07feeb 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -32,6 +32,12 @@ config CONSOLE_VGA
 	bool "Use VGA console, once initialized."
 	default n
 
+config CONSOLE_VGA_ONBOARD_AT_FIRST
+	bool "Use onboard VGA as primary"
+	default n
+	help
+	  If not selected, the last adapter found will be used.
+
 config MAXIMUM_CONSOLE_LOGLEVEL
 	int "Maximum console loglevel"
 	default 9
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index 3f7d606c4c..b9ce5a893c 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -19,7 +19,7 @@ config DCACHE_RAM_SIZE
 
 config SMP
 	bool
-	default n
+	default y if MAX_CPUS != 1
 
 config CPU_SOCKET_TYPE
 	hex
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 7cb5da0893..c4ee9fa271 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -16,4 +16,4 @@ config XIP_ROM_BASE
 
 config XIP_ROM_SIZE
 	hex
-	default 0x2000
+	default 0x20000
diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig
index 03bf076ba3..ca3a58e202 100644
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -331,6 +331,11 @@ config MAINBOARD_VENDOR
 	default "Tyan"
 	depends on VENDOR_TYAN
 
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x10f1
+	depends on VENDOR_TYAN
+
 config MAINBOARD_VENDOR
 	string
 	default "VIA"
diff --git a/src/mainboard/amd/rumba/Kconfig b/src/mainboard/amd/rumba/Kconfig
index 220d067b63..92b329116f 100644
--- a/src/mainboard/amd/rumba/Kconfig
+++ b/src/mainboard/amd/rumba/Kconfig
@@ -52,6 +52,6 @@ config IRQ_SLOT_COUNT
 	depends on BOARD_AMD_RUMBA
 
 config USE_INIT
-	int
-	default 0
+	bool
+	default n
 	depends on BOARD_AMD_RUMBA
diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index 51da447c13..dce3ce4b1d 100644
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -69,30 +69,24 @@ config MAINBOARD_PART_NUMBER
 	default "Serengeti-Cheetah"
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
-
-config USE_FAILOVER_IMAGE
-	int
-	default 0
-	depends on BOARD_AMD_SERENGETI_CHEETAH
-
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config MEM_TRAIN_SEQ
-	int
-	default 1
+	bool
+	default y
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config HAVE_FAILOVER_BOOT
-	int
-	default 0
+	bool
+	default n
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config USE_FAILOVER_IMAGE
-	int
-	default 0
+	bool
+	default n
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config MAX_CPUS
@@ -106,28 +100,28 @@ config MAX_PHYSICAL_CPUS
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config MEM_TRAIN_SEQ
-	int
-	default 1
+	bool
+	default y
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config AP_CODE_IN_CAR
-	int
-	default 1
+	bool
+	default y
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
-	int
-	default 0
+	bool
+	default n
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config HT_CHAIN_END_UNITID_BASE
-	int
+	hex
 	default 0x6
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config USE_INIT
-	int
-	default 0
+	bool
+	default n
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config SERIAL_CPU_INIT
@@ -136,13 +130,13 @@ config SERIAL_CPU_INIT
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config AP_CODE_IN_CAR
-	int
-	default 1
+	bool
+	default y
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config WAIT_BEFORE_CPUS_INIT
-	int
-	default 1
+	bool
+	default y
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config SB_HT_CHAIN_ON_BUS0
diff --git a/src/northbridge/intel/i82810/Kconfig b/src/northbridge/intel/i82810/Kconfig
index 62f3705061..c1c4a9398d 100644
--- a/src/northbridge/intel/i82810/Kconfig
+++ b/src/northbridge/intel/i82810/Kconfig
@@ -18,11 +18,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-config HAVE_HIGH_TABLES
-	bool "Do we have high tables"
-	default y
-
 config NORTHBRIDGE_INTEL_I82810
 	bool
 	default n
-