9 files changed, 29 insertions, 94 deletions

diff --git a/src/mainboard/tyan/s1846/Kconfig b/src/mainboard/tyan/s1846/Kconfig
index 5edaefadda..d48e265a2a 100644
--- a/src/mainboard/tyan/s1846/Kconfig
+++ b/src/mainboard/tyan/s1846/Kconfig
@@ -26,7 +26,6 @@ config BOARD_TYAN_S1846
 	select SOUTHBRIDGE_INTEL_I82371EB
 	select SUPERIO_NSC_PC87309
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/tyan/s2880/Kconfig b/src/mainboard/tyan/s2880/Kconfig
index 6481d5ff7d..06dac3df3f 100644
--- a/src/mainboard/tyan/s2880/Kconfig
+++ b/src/mainboard/tyan/s2880/Kconfig
@@ -10,6 +10,7 @@ config BOARD_TYAN_S2880
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_512
+	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR
 	string
@@ -23,7 +24,7 @@ config APIC_ID_OFFSET
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 0
 	depends on BOARD_TYAN_S2880
 
 config LB_CKS_RANGE_END
@@ -53,7 +54,7 @@ config HW_MEM_HOLE_SIZEK
 
 config MAX_CPUS
 	int
-	default 4
+	default 2
 	depends on BOARD_TYAN_S2880
 
 config MAX_PHYSICAL_CPUS
@@ -68,12 +69,12 @@ config HW_MEM_HOLE_SIZE_AUTO_INC
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0xa
+	default 0x1
 	depends on BOARD_TYAN_S2880
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x6
+	default 0x20
 	depends on BOARD_TYAN_S2880
 
 config USE_INIT
@@ -86,16 +87,6 @@ config WAIT_BEFORE_CPUS_INIT
 	default n
 	depends on BOARD_TYAN_S2880
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 0
-	depends on BOARD_TYAN_S2880
-
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
-	depends on BOARD_TYAN_S2880
-
 config IRQ_SLOT_COUNT
 	int
 	default 9
diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig
index 335f1dbb99..2cfa52a660 100644
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -10,6 +10,7 @@ config BOARD_TYAN_S2881
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_512
+	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR
 	string
@@ -23,7 +24,7 @@ config APIC_ID_OFFSET
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 0
 	depends on BOARD_TYAN_S2881
 
 config LB_CKS_RANGE_END
@@ -86,16 +87,6 @@ config WAIT_BEFORE_CPUS_INIT
 	default n
 	depends on BOARD_TYAN_S2881
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 0
-	depends on BOARD_TYAN_S2881
-
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
-	depends on BOARD_TYAN_S2881
-
 config IRQ_SLOT_COUNT
 	int
 	default 9
diff --git a/src/mainboard/tyan/s2882/Kconfig b/src/mainboard/tyan/s2882/Kconfig
index 7de1434153..2af58fe443 100644
--- a/src/mainboard/tyan/s2882/Kconfig
+++ b/src/mainboard/tyan/s2882/Kconfig
@@ -10,6 +10,7 @@ config BOARD_TYAN_S2882
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_512
+	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR
 	string
@@ -23,7 +24,7 @@ config APIC_ID_OFFSET
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 0
 	depends on BOARD_TYAN_S2882
 
 config LB_CKS_RANGE_END
@@ -68,12 +69,12 @@ config HW_MEM_HOLE_SIZE_AUTO_INC
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0xa
+	default 0x1
 	depends on BOARD_TYAN_S2882
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x6
+	default 0x20
 	depends on BOARD_TYAN_S2882
 
 config USE_INIT
@@ -86,16 +87,6 @@ config WAIT_BEFORE_CPUS_INIT
 	default n
 	depends on BOARD_TYAN_S2882
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 0
-	depends on BOARD_TYAN_S2882
-
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
-	depends on BOARD_TYAN_S2882
-
 config IRQ_SLOT_COUNT
 	int
 	default 9
diff --git a/src/mainboard/tyan/s2885/Kconfig b/src/mainboard/tyan/s2885/Kconfig
index 97fb043c0f..12bf3e3f39 100644
--- a/src/mainboard/tyan/s2885/Kconfig
+++ b/src/mainboard/tyan/s2885/Kconfig
@@ -10,6 +10,7 @@ config BOARD_TYAN_S2885
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_512
+	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR
 	string
@@ -86,16 +87,6 @@ config WAIT_BEFORE_CPUS_INIT
 	default n
 	depends on BOARD_TYAN_S2885
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 0
-	depends on BOARD_TYAN_S2885
-
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
-	depends on BOARD_TYAN_S2885
-
 config IRQ_SLOT_COUNT
 	int
 	default 9
diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig
index b891e4da10..ef609bce64 100644
--- a/src/mainboard/tyan/s2891/Kconfig
+++ b/src/mainboard/tyan/s2891/Kconfig
@@ -11,7 +11,8 @@ config BOARD_TYAN_S2891
 	select HAVE_MP_TABLE
 	select SERIAL_CPU_INIT
 	select HAVE_ACPI_TABLES
-	select BOARD_ROMSIZE_KB_1024
+	select BOARD_ROMSIZE_KB_512
+	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR
 	string
@@ -88,16 +89,6 @@ config WAIT_BEFORE_CPUS_INIT
 	default n
 	depends on BOARD_TYAN_S2891
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-	depends on BOARD_TYAN_S2891
-
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
-	depends on BOARD_TYAN_S2891
-
 config IRQ_SLOT_COUNT
 	int
 	default 11
diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig
index 883ea6f7e4..8b02d3e845 100644
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/src/mainboard/tyan/s2912/Kconfig
@@ -12,7 +12,6 @@ config BOARD_TYAN_S2912
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
-	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
  
@@ -93,12 +92,12 @@ config HW_MEM_HOLE_SIZEK
 
 config MAX_CPUS
 	int
-	default 2
+	default 4
 	depends on BOARD_TYAN_S2912
 
 config MAX_PHYSICAL_CPUS
 	int
-	default 1
+	default 2
 	depends on BOARD_TYAN_S2912
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
@@ -113,7 +112,7 @@ config HT_CHAIN_UNITID_BASE
 
 config HT_CHAIN_END_UNITID_BASE
 	hex	
-	default 0x0
+	default 0x20
 	depends on BOARD_TYAN_S2912
 
 config USE_INIT
diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig
index 9ba1d57528..756b69423b 100644
--- a/src/mainboard/tyan/s4880/Kconfig
+++ b/src/mainboard/tyan/s4880/Kconfig
@@ -13,6 +13,7 @@ config BOARD_TYAN_S4880
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
+	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR
 	string
@@ -41,12 +42,7 @@ config K8_REV_F_SUPPORT
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
-	depends on BOARD_TYAN_S4880
-
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
+	default 0
 	depends on BOARD_TYAN_S4880
 
 config LB_CKS_RANGE_END
@@ -71,22 +67,22 @@ config HW_MEM_HOLE_SIZEK
 
 config MAX_CPUS
 	int
-	default 4
+	default 8
 	depends on BOARD_TYAN_S4880
 
 config MAX_PHYSICAL_CPUS
 	int
-	default 2
+	default 4
 	depends on BOARD_TYAN_S4880
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x20
 	depends on BOARD_TYAN_S4880
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0x0
+	default 0x1
 	depends on BOARD_TYAN_S4880
 
 config USE_INIT
@@ -94,11 +90,6 @@ config USE_INIT
 	default n
 	depends on BOARD_TYAN_S4880
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-	depends on BOARD_TYAN_S4880
-
 config IRQ_SLOT_COUNT
 	int
 	default 11
diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig
index 8970280344..ae48dc43d7 100644
--- a/src/mainboard/tyan/s4882/Kconfig
+++ b/src/mainboard/tyan/s4882/Kconfig
@@ -13,6 +13,7 @@ config BOARD_TYAN_S4882
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
+	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR
 	string
@@ -41,12 +42,7 @@ config K8_REV_F_SUPPORT
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
-	depends on BOARD_TYAN_S4882
-
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
+	default 0
 	depends on BOARD_TYAN_S4882
 
 config LB_CKS_RANGE_END
@@ -71,22 +67,22 @@ config HW_MEM_HOLE_SIZEK
 
 config MAX_CPUS
 	int
-	default 4
+	default 8
 	depends on BOARD_TYAN_S4882
 
 config MAX_PHYSICAL_CPUS
 	int
-	default 2
+	default 4
 	depends on BOARD_TYAN_S4882
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x20
 	depends on BOARD_TYAN_S4882
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0x0
+	default 0x1
 	depends on BOARD_TYAN_S4882
 
 config USE_INIT
@@ -94,11 +90,6 @@ config USE_INIT
 	default n
 	depends on BOARD_TYAN_S4882
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-	depends on BOARD_TYAN_S4882
-
 config IRQ_SLOT_COUNT
 	int
 	default 11