Index: src/mainboard/iwill/dk8s2/Kconfig
===================================================================
--- src/mainboard/iwill/dk8s2/Kconfig	(revision 5050)
+++ src/mainboard/iwill/dk8s2/Kconfig	(working copy)
@@ -64,7 +64,7 @@
 
 config MAX_CPUS
 	int
-	default 4
+	default 2
 	depends on BOARD_IWILL_DK8S2
 
 config MAX_PHYSICAL_CPUS
@@ -79,17 +79,17 @@
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 0
 	depends on BOARD_IWILL_DK8S2
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x6
+	default 0x20
 	depends on BOARD_IWILL_DK8S2
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0xa
+	default 0x1
 	depends on BOARD_IWILL_DK8S2
 
 config USE_INIT
Index: src/mainboard/iwill/dk8x/Kconfig
===================================================================
--- src/mainboard/iwill/dk8x/Kconfig	(revision 5050)
+++ src/mainboard/iwill/dk8x/Kconfig	(working copy)
@@ -63,7 +63,7 @@
 
 config MAX_CPUS
 	int
-	default 4
+	default 2
 	depends on BOARD_IWILL_DK8X
 
 config MAX_PHYSICAL_CPUS
@@ -78,17 +78,17 @@
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 0
 	depends on BOARD_IWILL_DK8X
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x6
+	default 0x20
 	depends on BOARD_IWILL_DK8X
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0xa
+	default 0x1
 	depends on BOARD_IWILL_DK8X
 
 config USE_INIT
Index: src/mainboard/axus/tc320/Kconfig
===================================================================
--- src/mainboard/axus/tc320/Kconfig	(revision 5050)
+++ src/mainboard/axus/tc320/Kconfig	(working copy)
@@ -28,7 +28,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/bcom/winnetp680/Kconfig
===================================================================
--- src/mainboard/bcom/winnetp680/Kconfig	(revision 5050)
+++ src/mainboard/bcom/winnetp680/Kconfig	(working copy)
@@ -7,7 +7,6 @@
 	select SUPERIO_WINBOND_W83697HF
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: src/mainboard/bcom/winnet100/Kconfig
===================================================================
--- src/mainboard/bcom/winnet100/Kconfig	(revision 5050)
+++ src/mainboard/bcom/winnet100/Kconfig	(working copy)
@@ -28,7 +28,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/televideo/tc7020/Kconfig
===================================================================
--- src/mainboard/televideo/tc7020/Kconfig	(revision 5050)
+++ src/mainboard/televideo/tc7020/Kconfig	(working copy)
@@ -28,7 +28,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/broadcom/blast/Kconfig
===================================================================
--- src/mainboard/broadcom/blast/Kconfig	(revision 5050)
+++ src/mainboard/broadcom/blast/Kconfig	(working copy)
@@ -13,6 +13,7 @@
 	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,14 +42,9 @@
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 1
 	depends on BOARD_BROADCOM_BLAST
 
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
-	depends on BOARD_BROADCOM_BLAST
-
 config LB_CKS_RANGE_END
 	int
 	default 122
@@ -81,12 +77,12 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x1
 	depends on BOARD_BROADCOM_BLAST
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0x0
+	default 0x6
 	depends on BOARD_BROADCOM_BLAST
 
 config USE_INIT
Index: src/mainboard/supermicro/h8dmr/Kconfig
===================================================================
--- src/mainboard/supermicro/h8dmr/Kconfig	(revision 5050)
+++ src/mainboard/supermicro/h8dmr/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
-	select BOARD_ROMSIZE_KB_512
+	select BOARD_ROMSIZE_KB_1024
 
 config MAINBOARD_DIR
 	string
@@ -86,7 +86,7 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x20
 	depends on BOARD_SUPERMICRO_H8DMR
 
 config HT_CHAIN_UNITID_BASE
Index: src/mainboard/supermicro/h8dme/Kconfig
===================================================================
--- src/mainboard/supermicro/h8dme/Kconfig	(revision 5050)
+++ src/mainboard/supermicro/h8dme/Kconfig	(working copy)
@@ -87,7 +87,7 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x20
 	depends on BOARD_SUPERMICRO_H8DME
 
 config HT_CHAIN_UNITID_BASE
Index: src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
===================================================================
--- src/mainboard/soyo/sy-6ba-plus-iii/Kconfig	(revision 5050)
+++ src/mainboard/soyo/sy-6ba-plus-iii/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_ITE_IT8671F
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/kontron/986lcd-m/Kconfig
===================================================================
--- src/mainboard/kontron/986lcd-m/Kconfig	(revision 5050)
+++ src/mainboard/kontron/986lcd-m/Kconfig	(working copy)
@@ -62,6 +62,11 @@
 	default 18
 	depends on BOARD_KONTRON_986LCD_M
 
+config MAX_CPUS
+	int
+	default 4
+	depends on BOARD_KONTRON_986LCD_M
+
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
Index: src/mainboard/kontron/kt690/Kconfig
===================================================================
--- src/mainboard/kontron/kt690/Kconfig	(revision 5050)
+++ src/mainboard/kontron/kt690/Kconfig	(working copy)
@@ -15,7 +15,7 @@
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select HAVE_ACPI_TABLES
-	select BOARD_ROMSIZE_KB_512
+	select BOARD_ROMSIZE_KB_1024
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR
Index: src/mainboard/a-trend/atc-6240/Kconfig
===================================================================
--- src/mainboard/a-trend/atc-6240/Kconfig	(revision 5050)
+++ src/mainboard/a-trend/atc-6240/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/a-trend/atc-6220/Kconfig
===================================================================
--- src/mainboard/a-trend/atc-6220/Kconfig	(revision 5050)
+++ src/mainboard/a-trend/atc-6220/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_WINBOND_W83977TF
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/gigabyte/m57sli/Kconfig
===================================================================
--- src/mainboard/gigabyte/m57sli/Kconfig	(revision 5050)
+++ src/mainboard/gigabyte/m57sli/Kconfig	(working copy)
@@ -13,7 +13,6 @@
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
-	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select HAVE_ACPI_TABLES
 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
@@ -115,7 +114,7 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex	
-	default 0x0
+	default 0x20
 	depends on BOARD_GIGABYTE_M57SLI
 
 config USE_INIT
Index: src/mainboard/gigabyte/ga_2761gxdk/Kconfig
===================================================================
--- src/mainboard/gigabyte/ga_2761gxdk/Kconfig	(revision 5050)
+++ src/mainboard/gigabyte/ga_2761gxdk/Kconfig	(working copy)
@@ -11,7 +11,6 @@
 	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
  
@@ -112,7 +111,7 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex	
-	default 0x0
+	default 0x20
 	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config USE_INIT
Index: src/mainboard/gigabyte/ga-6bxc/Kconfig
===================================================================
--- src/mainboard/gigabyte/ga-6bxc/Kconfig	(revision 5050)
+++ src/mainboard/gigabyte/ga-6bxc/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_ITE_IT8671F
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/digitallogic/msm800sev/Kconfig
===================================================================
--- src/mainboard/digitallogic/msm800sev/Kconfig	(revision 5050)
+++ src/mainboard/digitallogic/msm800sev/Kconfig	(working copy)
@@ -8,7 +8,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select USE_DCACHE_RAM
 	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_256
Index: src/mainboard/digitallogic/msm586seg/Kconfig
===================================================================
--- src/mainboard/digitallogic/msm586seg/Kconfig	(revision 5050)
+++ src/mainboard/digitallogic/msm586seg/Kconfig	(working copy)
@@ -3,7 +3,7 @@
 	select ARCH_X86
 	select CPU_AMD_SC520
 	select HAVE_PIRQ_TABLE
-	select BOARD_ROMSIZE_KB_256
+	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/mitac/6513wu/Kconfig
===================================================================
--- src/mainboard/mitac/6513wu/Kconfig	(revision 5050)
+++ src/mainboard/mitac/6513wu/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_SMSC_SMSCSUPERIO
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: src/mainboard/olpc/btest/Kconfig
===================================================================
--- src/mainboard/olpc/btest/Kconfig	(revision 5050)
+++ src/mainboard/olpc/btest/Kconfig	(working copy)
@@ -5,7 +5,6 @@
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 
Index: src/mainboard/olpc/rev_a/Kconfig
===================================================================
--- src/mainboard/olpc/rev_a/Kconfig	(revision 5050)
+++ src/mainboard/olpc/rev_a/Kconfig	(working copy)
@@ -5,7 +5,6 @@
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 
Index: src/mainboard/technologic/ts5300/Kconfig
===================================================================
--- src/mainboard/technologic/ts5300/Kconfig	(revision 5050)
+++ src/mainboard/technologic/ts5300/Kconfig	(working copy)
@@ -3,7 +3,7 @@
 	select ARCH_X86
 	select CPU_AMD_SC520
 	select HAVE_PIRQ_TABLE
-	select BOARD_ROMSIZE_KB_256
+	select BOARD_ROMSIZE_KB_128
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/amd/pistachio/Kconfig
===================================================================
--- src/mainboard/amd/pistachio/Kconfig	(revision 5050)
+++ src/mainboard/amd/pistachio/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select WAIT_BEFORE_CPUS_INIT
 	select HAVE_ACPI_TABLES
-	select BOARD_ROMSIZE_KB_512
+	select BOARD_ROMSIZE_KB_1024
 
 config MAINBOARD_DIR
 	string
@@ -78,17 +78,17 @@
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 1
 	depends on BOARD_AMD_PISTACHIO
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x6
+	default 0x1
 	depends on BOARD_AMD_PISTACHIO
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0xa
+	default 0x0
 	depends on BOARD_AMD_PISTACHIO
 
 config USE_INIT
Index: src/mainboard/amd/dbm690t/Kconfig
===================================================================
--- src/mainboard/amd/dbm690t/Kconfig	(revision 5050)
+++ src/mainboard/amd/dbm690t/Kconfig	(working copy)
@@ -15,7 +15,7 @@
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	select BOARD_ROMSIZE_KB_512
+	select BOARD_ROMSIZE_KB_1024
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/amd/rumba/Kconfig
===================================================================
--- src/mainboard/amd/rumba/Kconfig	(revision 5050)
+++ src/mainboard/amd/rumba/Kconfig	(working copy)
@@ -25,7 +25,6 @@
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 
Index: src/mainboard/amd/norwich/Kconfig
===================================================================
--- src/mainboard/amd/norwich/Kconfig	(revision 5050)
+++ src/mainboard/amd/norwich/Kconfig	(working copy)
@@ -7,7 +7,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select USE_DCACHE_RAM
 	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_256
Index: src/mainboard/amd/db800/Kconfig
===================================================================
--- src/mainboard/amd/db800/Kconfig	(revision 5050)
+++ src/mainboard/amd/db800/Kconfig	(working copy)
@@ -8,7 +8,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select USE_DCACHE_RAM
 	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_256
Index: src/mainboard/biostar/m6tba/Kconfig
===================================================================
--- src/mainboard/biostar/m6tba/Kconfig	(revision 5050)
+++ src/mainboard/biostar/m6tba/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_SMSC_SMSCSUPERIO
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/rca/rm4100/Kconfig
===================================================================
--- src/mainboard/rca/rm4100/Kconfig	(revision 5050)
+++ src/mainboard/rca/rm4100/Kconfig	(working copy)
@@ -7,7 +7,6 @@
 	select SUPERIO_SMSC_SMSCSUPERIO
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: src/mainboard/nec/powermate2000/Kconfig
===================================================================
--- src/mainboard/nec/powermate2000/Kconfig	(revision 5050)
+++ src/mainboard/nec/powermate2000/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_SMSC_SMSCSUPERIO
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: src/mainboard/azza/pt-6ibd/Kconfig
===================================================================
--- src/mainboard/azza/pt-6ibd/Kconfig	(revision 5050)
+++ src/mainboard/azza/pt-6ibd/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_WINBOND_W83977TF
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/iei/nova4899r/Kconfig
===================================================================
--- src/mainboard/iei/nova4899r/Kconfig	(revision 5050)
+++ src/mainboard/iei/nova4899r/Kconfig	(working copy)
@@ -29,7 +29,6 @@
 	select PIRQ_ROUTE
 	select HAVE_OPTION_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/iei/pcisa-lx-800-r10/Kconfig
===================================================================
--- src/mainboard/iei/pcisa-lx-800-r10/Kconfig	(revision 5050)
+++ src/mainboard/iei/pcisa-lx-800-r10/Kconfig	(working copy)
@@ -8,7 +8,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select USE_DCACHE_RAM
 	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_256
Index: src/mainboard/iei/juki-511p/Kconfig
===================================================================
--- src/mainboard/iei/juki-511p/Kconfig	(revision 5050)
+++ src/mainboard/iei/juki-511p/Kconfig	(working copy)
@@ -28,7 +28,6 @@
 	select PIRQ_ROUTE
 	select HAVE_OPTION_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/hp/dl145_g3/Kconfig
===================================================================
--- src/mainboard/hp/dl145_g3/Kconfig	(revision 5050)
+++ src/mainboard/hp/dl145_g3/Kconfig	(working copy)
@@ -14,6 +14,7 @@
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_512
+	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR
 	string
@@ -82,12 +83,12 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x1
 	depends on BOARD_HP_DL145_G3
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0x0
+	default 0x6
 	depends on BOARD_HP_DL145_G3
 
 config USE_INIT
Index: src/mainboard/hp/e_vectra_p2706t/Kconfig
===================================================================
--- src/mainboard/hp/e_vectra_p2706t/Kconfig	(revision 5050)
+++ src/mainboard/hp/e_vectra_p2706t/Kconfig	(working copy)
@@ -30,7 +30,6 @@
 	select SUPERIO_NSC_PC87360
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: src/mainboard/tyan/s2912/Kconfig
===================================================================
--- src/mainboard/tyan/s2912/Kconfig	(revision 5050)
+++ src/mainboard/tyan/s2912/Kconfig	(working copy)
@@ -12,7 +12,6 @@
 	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 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_END_UNITID_BASE
 	hex	
-	default 0x0
+	default 0x20
 	depends on BOARD_TYAN_S2912
 
 config USE_INIT
Index: src/mainboard/tyan/s2880/Kconfig
===================================================================
--- src/mainboard/tyan/s2880/Kconfig	(revision 5050)
+++ src/mainboard/tyan/s2880/Kconfig	(working copy)
@@ -10,6 +10,7 @@
 	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 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 MAX_CPUS
 	int
-	default 4
+	default 2
 	depends on BOARD_TYAN_S2880
 
 config MAX_PHYSICAL_CPUS
@@ -68,12 +69,12 @@
 
 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 @@
 	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
Index: src/mainboard/tyan/s2881/Kconfig
===================================================================
--- src/mainboard/tyan/s2881/Kconfig	(revision 5050)
+++ src/mainboard/tyan/s2881/Kconfig	(working copy)
@@ -10,6 +10,7 @@
 	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 SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 0
 	depends on BOARD_TYAN_S2881
 
 config LB_CKS_RANGE_END
@@ -86,16 +87,6 @@
 	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
Index: src/mainboard/tyan/s1846/Kconfig
===================================================================
--- src/mainboard/tyan/s1846/Kconfig	(revision 5050)
+++ src/mainboard/tyan/s1846/Kconfig	(working copy)
@@ -26,7 +26,6 @@
 	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
Index: src/mainboard/tyan/s4880/Kconfig
===================================================================
--- src/mainboard/tyan/s4880/Kconfig	(revision 5050)
+++ src/mainboard/tyan/s4880/Kconfig	(working copy)
@@ -13,6 +13,7 @@
 	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,14 +42,9 @@
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 0
 	depends on BOARD_TYAN_S4880
 
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
-	depends on BOARD_TYAN_S4880
-
 config LB_CKS_RANGE_END
 	int
 	default 122
@@ -71,22 +67,22 @@
 
 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 @@
 	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
Index: src/mainboard/tyan/s2891/Kconfig
===================================================================
--- src/mainboard/tyan/s2891/Kconfig	(revision 5050)
+++ src/mainboard/tyan/s2891/Kconfig	(working copy)
@@ -11,7 +11,8 @@
 	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 @@
 	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
Index: src/mainboard/tyan/s2882/Kconfig
===================================================================
--- src/mainboard/tyan/s2882/Kconfig	(revision 5050)
+++ src/mainboard/tyan/s2882/Kconfig	(working copy)
@@ -10,6 +10,7 @@
 	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 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 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 @@
 	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
Index: src/mainboard/tyan/s4882/Kconfig
===================================================================
--- src/mainboard/tyan/s4882/Kconfig	(revision 5050)
+++ src/mainboard/tyan/s4882/Kconfig	(working copy)
@@ -13,6 +13,7 @@
 	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,14 +42,9 @@
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 0
 	depends on BOARD_TYAN_S4882
 
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
-	depends on BOARD_TYAN_S4882
-
 config LB_CKS_RANGE_END
 	int
 	default 122
@@ -71,22 +67,22 @@
 
 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 @@
 	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
Index: src/mainboard/tyan/s2885/Kconfig
===================================================================
--- src/mainboard/tyan/s2885/Kconfig	(revision 5050)
+++ src/mainboard/tyan/s2885/Kconfig	(working copy)
@@ -10,6 +10,7 @@
 	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 @@
 	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
Index: src/mainboard/pcengines/alix1c/Kconfig
===================================================================
--- src/mainboard/pcengines/alix1c/Kconfig	(revision 5050)
+++ src/mainboard/pcengines/alix1c/Kconfig	(working copy)
@@ -8,7 +8,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select USE_DCACHE_RAM
 	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_512
Index: src/mainboard/artecgroup/dbe61/Kconfig
===================================================================
--- src/mainboard/artecgroup/dbe61/Kconfig	(revision 5050)
+++ src/mainboard/artecgroup/dbe61/Kconfig	(working copy)
@@ -7,7 +7,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select USE_DCACHE_RAM
 	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_256
Index: src/mainboard/asi/mb_5blgp/Kconfig
===================================================================
--- src/mainboard/asi/mb_5blgp/Kconfig	(revision 5050)
+++ src/mainboard/asi/mb_5blgp/Kconfig	(working copy)
@@ -28,7 +28,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/asi/mb_5blmp/Kconfig
===================================================================
--- src/mainboard/asi/mb_5blmp/Kconfig	(revision 5050)
+++ src/mainboard/asi/mb_5blmp/Kconfig	(working copy)
@@ -28,7 +28,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/abit/be6-ii_v2_0/Kconfig
===================================================================
--- src/mainboard/abit/be6-ii_v2_0/Kconfig	(revision 5050)
+++ src/mainboard/abit/be6-ii_v2_0/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_WINBOND_W83977TF
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/lippert/roadrunner-lx/Kconfig
===================================================================
--- src/mainboard/lippert/roadrunner-lx/Kconfig	(revision 5050)
+++ src/mainboard/lippert/roadrunner-lx/Kconfig	(working copy)
@@ -8,7 +8,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select USE_DCACHE_RAM
 	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_512
Index: src/mainboard/lippert/frontrunner/Kconfig
===================================================================
--- src/mainboard/lippert/frontrunner/Kconfig	(revision 5050)
+++ src/mainboard/lippert/frontrunner/Kconfig	(working copy)
@@ -5,7 +5,6 @@
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5535
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 
Index: src/mainboard/lippert/spacerunner-lx/Kconfig
===================================================================
--- src/mainboard/lippert/spacerunner-lx/Kconfig	(revision 5050)
+++ src/mainboard/lippert/spacerunner-lx/Kconfig	(working copy)
@@ -8,7 +8,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select USE_DCACHE_RAM
 	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_512
Index: src/mainboard/via/vt8454c/Kconfig
===================================================================
--- src/mainboard/via/vt8454c/Kconfig	(revision 5050)
+++ src/mainboard/via/vt8454c/Kconfig	(working copy)
@@ -10,7 +10,7 @@
 #	select MMCONF_SUPPORT
 	select USE_PRINTK_IN_CAR
 	select HAVE_ACPI_TABLES
-	select BOARD_ROMSIZE_KB_1024
+	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/via/pc2500e/Kconfig
===================================================================
--- src/mainboard/via/pc2500e/Kconfig	(revision 5050)
+++ src/mainboard/via/pc2500e/Kconfig	(working copy)
@@ -9,7 +9,6 @@
 	select HAVE_MP_TABLE
 	select SMP
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: src/mainboard/dell/s1850/Kconfig
===================================================================
--- src/mainboard/dell/s1850/Kconfig	(revision 5050)
+++ src/mainboard/dell/s1850/Kconfig	(working copy)
@@ -44,12 +44,12 @@
 
 config MAX_CPUS
 	int
-	default 2
+	default 4
 	depends on BOARD_DELL_S1850
 
 config MAX_PHYSICAL_CPUS
 	int
-	default 2
+	default 1
 	depends on BOARD_DELL_S1850
 
 config USE_INIT
Index: src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
===================================================================
--- src/mainboard/compaq/deskpro_en_sff_p600/Kconfig	(revision 5050)
+++ src/mainboard/compaq/deskpro_en_sff_p600/Kconfig	(working copy)
@@ -28,7 +28,6 @@
 	select SUPERIO_NSC_PC97317
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/roda/rk886ex/Kconfig
===================================================================
--- src/mainboard/roda/rk886ex/Kconfig	(revision 5050)
+++ src/mainboard/roda/rk886ex/Kconfig	(working copy)
@@ -58,6 +58,11 @@
 	default 18
 	depends on BOARD_RODA_RK886EX
 
+config MAX_CPUS
+	int
+	default 4
+	depends on BOARD_RODA_RK886EX
+
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
Index: src/mainboard/msi/ms6119/Kconfig
===================================================================
--- src/mainboard/msi/ms6119/Kconfig	(revision 5050)
+++ src/mainboard/msi/ms6119/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_WINBOND_W83977TF
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/msi/ms6147/Kconfig
===================================================================
--- src/mainboard/msi/ms6147/Kconfig	(revision 5050)
+++ src/mainboard/msi/ms6147/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_WINBOND_W83977TF
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/msi/ms6156/Kconfig
===================================================================
--- src/mainboard/msi/ms6156/Kconfig	(revision 5050)
+++ src/mainboard/msi/ms6156/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_WINBOND_W83977TF
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/msi/ms9282/Kconfig
===================================================================
--- src/mainboard/msi/ms9282/Kconfig	(revision 5050)
+++ src/mainboard/msi/ms9282/Kconfig	(working copy)
@@ -11,7 +11,6 @@
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
-	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
  
@@ -42,7 +41,7 @@
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 1
 	depends on BOARD_MSI_MS9282
 
 config LB_CKS_RANGE_START
@@ -87,12 +86,12 @@
 
 config MAX_CPUS
 	int
-	default 2
+	default 4
 	depends on BOARD_MSI_MS9282
 
 config MAX_PHYSICAL_CPUS
 	int
-	default 1
+	default 2
 	depends on BOARD_MSI_MS9282
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
@@ -107,7 +106,7 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex	
-	default 0x0
+	default 0x20
 	depends on BOARD_MSI_MS9282
 
 config USE_INIT
Index: src/mainboard/msi/ms9185/Kconfig
===================================================================
--- src/mainboard/msi/ms9185/Kconfig	(revision 5050)
+++ src/mainboard/msi/ms9185/Kconfig	(working copy)
@@ -14,6 +14,7 @@
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_512
+	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR
 	string
@@ -45,11 +46,6 @@
 	default 2
 	depends on BOARD_MSI_MS9185
 
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
-	depends on BOARD_MSI_MS9185
-
 config LB_CKS_RANGE_END
 	int
 	default 122
@@ -82,12 +78,12 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x1
 	depends on BOARD_MSI_MS9185
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0x0
+	default 0x6
 	depends on BOARD_MSI_MS9185
 
 config USE_INIT
@@ -95,11 +91,6 @@
 	default n
 	depends on BOARD_MSI_MS9185
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-	depends on BOARD_MSI_MS9185
-
 config IRQ_SLOT_COUNT
 	int
 	default 11
Index: src/mainboard/msi/ms7260/Kconfig
===================================================================
--- src/mainboard/msi/ms7260/Kconfig	(revision 5050)
+++ src/mainboard/msi/ms7260/Kconfig	(working copy)
@@ -12,7 +12,6 @@
 	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
  
@@ -113,7 +112,7 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex	
-	default 0x0
+	default 0x20
 	depends on BOARD_MSI_MS7260
 
 config USE_INIT
Index: src/mainboard/arima/hdama/Kconfig
===================================================================
--- src/mainboard/arima/hdama/Kconfig	(revision 5050)
+++ src/mainboard/arima/hdama/Kconfig	(working copy)
@@ -72,7 +72,7 @@
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 1
+	default 0
 	depends on BOARD_ARIMA_HDAMA
 
 config HT_CHAIN_END_UNITID_BASE
Index: src/mainboard/sunw/ultra40/Kconfig
===================================================================
--- src/mainboard/sunw/ultra40/Kconfig	(revision 5050)
+++ src/mainboard/sunw/ultra40/Kconfig	(working copy)
@@ -80,7 +80,7 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x20
 	depends on BOARD_SUNW_ULTRA40
 
 config HT_CHAIN_UNITID_BASE
Index: src/mainboard/advantech/pcm-5820/Kconfig
===================================================================
--- src/mainboard/advantech/pcm-5820/Kconfig	(revision 5050)
+++ src/mainboard/advantech/pcm-5820/Kconfig	(working copy)
@@ -28,7 +28,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/eaglelion/5bcm/Kconfig
===================================================================
--- src/mainboard/eaglelion/5bcm/Kconfig	(revision 5050)
+++ src/mainboard/eaglelion/5bcm/Kconfig	(working copy)
@@ -28,7 +28,6 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/newisys/khepri/Kconfig
===================================================================
--- src/mainboard/newisys/khepri/Kconfig	(revision 5050)
+++ src/mainboard/newisys/khepri/Kconfig	(working copy)
@@ -13,6 +13,7 @@
 	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,14 +42,9 @@
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 0
 	depends on BOARD_NEWISYS_KHEPRI
 
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
-	depends on BOARD_NEWISYS_KHEPRI
-
 config LB_CKS_RANGE_END
 	int
 	default 122
@@ -81,12 +77,12 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x20
 	depends on BOARD_NEWISYS_KHEPRI
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0x0
+	default 0x1
 	depends on BOARD_NEWISYS_KHEPRI
 
 config USE_INIT
Index: src/mainboard/technexion/tim8690/Kconfig
===================================================================
--- src/mainboard/technexion/tim8690/Kconfig	(revision 5050)
+++ src/mainboard/technexion/tim8690/Kconfig	(working copy)
@@ -79,17 +79,17 @@
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 1
 	depends on BOARD_TECHNEXION_TIM8690
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x6
+	default 0x1
 	depends on BOARD_TECHNEXION_TIM8690
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0xa
+	default 0x0
 	depends on BOARD_TECHNEXION_TIM8690
 
 config USE_INIT
Index: src/mainboard/ibm/e326/Kconfig
===================================================================
--- src/mainboard/ibm/e326/Kconfig	(revision 5050)
+++ src/mainboard/ibm/e326/Kconfig	(working copy)
@@ -78,17 +78,17 @@
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 0
 	depends on BOARD_IBM_E326
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x6
+	default 0x20
 	depends on BOARD_IBM_E326
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0xa
+	default 0x1
 	depends on BOARD_IBM_E326
 
 config USE_INIT
Index: src/mainboard/ibm/e325/Kconfig
===================================================================
--- src/mainboard/ibm/e325/Kconfig	(revision 5050)
+++ src/mainboard/ibm/e325/Kconfig	(working copy)
@@ -78,17 +78,17 @@
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 0
 	depends on BOARD_IBM_E325
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x6
+	default 0x20
 	depends on BOARD_IBM_E325
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0xa
+	default 0x1
 	depends on BOARD_IBM_E325
 
 config USE_INIT
Index: src/mainboard/nvidia/l1_2pvv/Kconfig
===================================================================
--- src/mainboard/nvidia/l1_2pvv/Kconfig	(revision 5050)
+++ src/mainboard/nvidia/l1_2pvv/Kconfig	(working copy)
@@ -12,7 +12,6 @@
 	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 MAX_CPUS
 	int
-	default 2
+	default 4
 	depends on BOARD_NVIDIA_L1_2PVV
 
 config MAX_PHYSICAL_CPUS
 	int
-	default 1
+	default 2
 	depends on BOARD_NVIDIA_L1_2PVV
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
@@ -113,7 +112,7 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex	
-	default 0x0
+	default 0x20
 	depends on BOARD_NVIDIA_L1_2PVV
 
 config USE_INIT
Index: src/mainboard/intel/d945gclf/Kconfig
===================================================================
--- src/mainboard/intel/d945gclf/Kconfig	(revision 5050)
+++ src/mainboard/intel/d945gclf/Kconfig	(working copy)
@@ -34,7 +34,7 @@
 	select UDELAY_LAPIC
 	select HAVE_ACPI_TABLES
 	select HAVE_SMI_HANDLER
-	select BOARD_ROMSIZE_KB_1024
+	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
 	string
@@ -81,6 +81,11 @@
 	default 18
 	depends on BOARD_INTEL_D945GCLF
 
+config MAX_CPUS
+	int
+	default 4
+	depends on BOARD_INTEL_D945GCLF
+
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
Index: src/mainboard/intel/truxton/Kconfig
===================================================================
--- src/mainboard/intel/truxton/Kconfig	(revision 5050)
+++ src/mainboard/intel/truxton/Kconfig	(working copy)
@@ -51,3 +51,7 @@
 	default 0x2680
 	depends on BOARD_INTEL_TRUXTON
 
+config MAX_CPUS
+	int
+	default 4
+	depends on BOARD_INTEL_TRUXTON
Index: src/mainboard/intel/mtarvon/Kconfig
===================================================================
--- src/mainboard/intel/mtarvon/Kconfig	(revision 5050)
+++ src/mainboard/intel/mtarvon/Kconfig	(working copy)
@@ -49,3 +49,8 @@
 	hex
 	default 0x2680
 	depends on BOARD_INTEL_MTARVON
+
+config MAX_CPUS
+	int
+	default 4
+	depends on BOARD_INTEL_MTARVON
Index: src/mainboard/intel/eagleheights/Kconfig
===================================================================
--- src/mainboard/intel/eagleheights/Kconfig	(revision 5050)
+++ src/mainboard/intel/eagleheights/Kconfig	(working copy)
@@ -11,7 +11,6 @@
 	select MMCONF_SUPPORT
 	select USE_PRINTK_IN_CAR
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select AP_IN_SIPI_WAIT
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_1024
@@ -61,6 +60,11 @@
 	default 18
 	depends on BOARD_INTEL_EAGLEHEIGHTS
 
+config MAX_CPUS
+	int
+	default 4
+	depends on BOARD_INTEL_EAGLEHEIGHTS
+	
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
Index: src/mainboard/asus/Kconfig
===================================================================
--- src/mainboard/asus/Kconfig	(revision 5050)
+++ src/mainboard/asus/Kconfig	(working copy)
@@ -26,6 +26,7 @@
 source "src/mainboard/asus/a8v-e_se/Kconfig"
 source "src/mainboard/asus/p2b/Kconfig"
 source "src/mainboard/asus/p2b-d/Kconfig"
+source "src/mainboard/asus/p2b-ds/Kconfig"
 source "src/mainboard/asus/p2b-f/Kconfig"
 source "src/mainboard/asus/p3b-f/Kconfig"
 source "src/mainboard/asus/m2v-mx_se/Kconfig"
Index: src/mainboard/asus/mew-am/Kconfig
===================================================================
--- src/mainboard/asus/mew-am/Kconfig	(revision 5050)
+++ src/mainboard/asus/mew-am/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_SMSC_SMSCSUPERIO
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: src/mainboard/asus/p2b/Kconfig
===================================================================
--- src/mainboard/asus/p2b/Kconfig	(revision 5050)
+++ src/mainboard/asus/p2b/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_WINBOND_W83977TF
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/asus/p2b-d/Kconfig
===================================================================
--- src/mainboard/asus/p2b-d/Kconfig	(revision 5050)
+++ src/mainboard/asus/p2b-d/Kconfig	(working copy)
@@ -29,7 +29,6 @@
 	select HAVE_MP_TABLE
 	select SMP
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/asus/p2b-f/Kconfig
===================================================================
--- src/mainboard/asus/p2b-f/Kconfig	(revision 5050)
+++ src/mainboard/asus/p2b-f/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_WINBOND_W83977TF
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/asus/p2b-ds/Kconfig
===================================================================
--- src/mainboard/asus/p2b-ds/Kconfig	(revision 5050)
+++ src/mainboard/asus/p2b-ds/Kconfig	(working copy)
@@ -29,7 +29,6 @@
 	select HAVE_MP_TABLE
 	select SMP
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/asus/p3b-f/Kconfig
===================================================================
--- src/mainboard/asus/p3b-f/Kconfig	(revision 5050)
+++ src/mainboard/asus/p3b-f/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_WINBOND_W83977TF
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: src/mainboard/asus/mew-vm/Kconfig
===================================================================
--- src/mainboard/asus/mew-vm/Kconfig	(revision 5050)
+++ src/mainboard/asus/mew-vm/Kconfig	(working copy)
@@ -27,7 +27,6 @@
 	select SUPERIO_SMSC_LPC47B272
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: src/mainboard/asus/a8n_e/Kconfig
===================================================================
--- src/mainboard/asus/a8n_e/Kconfig	(revision 5050)
+++ src/mainboard/asus/a8n_e/Kconfig	(working copy)
@@ -80,7 +80,7 @@
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x20
 	depends on BOARD_ASUS_A8N_E
 
 config HT_CHAIN_UNITID_BASE
