Align several kconfig options to match newconfig:

HT_CHAIN_UNITID_BASE HT_CHAIN_END_UNITID_BASE SB_HT_CHAIN_ON_BUS0 SB_HT_CHAIN_UNITID_OFFSET_ONLY MAX_CPUS MAX_PHYSICAL_CPUS ROM_SIZE TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 Also hook up asus/p2b-ds Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5051 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2010-01-25 07:56:01 +00:00
parent 480b37f8e9
commit 29647d97c5
87 changed files with 118 additions and 220 deletions
--- a/src/mainboard/a-trend/atc-6220/Kconfig
+++ b/src/mainboard/a-trend/atc-6220/Kconfig
@@ -27,7 +27,6 @@ config BOARD_A_TREND_ATC_6220
 	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
--- a/src/mainboard/a-trend/atc-6240/Kconfig
+++ b/src/mainboard/a-trend/atc-6240/Kconfig
@@ -27,7 +27,6 @@ config BOARD_A_TREND_ATC_6240
 	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
--- a/src/mainboard/abit/be6-ii_v2_0/Kconfig
+++ b/src/mainboard/abit/be6-ii_v2_0/Kconfig
@@ -27,7 +27,6 @@ config BOARD_ABIT_BE6_II_V2_0
 	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
--- a/src/mainboard/advantech/pcm-5820/Kconfig
+++ b/src/mainboard/advantech/pcm-5820/Kconfig
@@ -28,7 +28,6 @@ config BOARD_ADVANTECH_PCM_5820
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256

 config MAINBOARD_DIR
--- a/src/mainboard/amd/db800/Kconfig
+++ b/src/mainboard/amd/db800/Kconfig
@@ -8,7 +8,6 @@ config BOARD_AMD_DB800
 	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
--- a/src/mainboard/amd/dbm690t/Kconfig
+++ b/src/mainboard/amd/dbm690t/Kconfig
@@ -15,7 +15,7 @@ config BOARD_AMD_DBM690T
 	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
--- a/src/mainboard/amd/norwich/Kconfig
+++ b/src/mainboard/amd/norwich/Kconfig
@@ -7,7 +7,6 @@ config BOARD_AMD_NORWICH
 	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
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/src/mainboard/amd/pistachio/Kconfig
@@ -14,7 +14,7 @@ config BOARD_AMD_PISTACHIO
 	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 HW_MEM_HOLE_SIZE_AUTO_INC

 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
--- a/src/mainboard/amd/rumba/Kconfig
+++ b/src/mainboard/amd/rumba/Kconfig
@@ -25,7 +25,6 @@ config BOARD_AMD_RUMBA
 	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

--- a/src/mainboard/arima/hdama/Kconfig
+++ b/src/mainboard/arima/hdama/Kconfig
@@ -72,7 +72,7 @@ config HW_MEM_HOLE_SIZE_AUTO_INC

 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 1
+	default 0
 	depends on BOARD_ARIMA_HDAMA

 config HT_CHAIN_END_UNITID_BASE
--- a/src/mainboard/artecgroup/dbe61/Kconfig
+++ b/src/mainboard/artecgroup/dbe61/Kconfig
@@ -7,7 +7,6 @@ config BOARD_ARTECGROUP_DBE61
 	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
--- a/src/mainboard/asi/mb_5blgp/Kconfig
+++ b/src/mainboard/asi/mb_5blgp/Kconfig
@@ -28,7 +28,6 @@ config BOARD_ASI_MB_5BLGP
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256

 config MAINBOARD_DIR
--- a/src/mainboard/asi/mb_5blmp/Kconfig
+++ b/src/mainboard/asi/mb_5blmp/Kconfig
@@ -28,7 +28,6 @@ config BOARD_ASI_MB_5BLMP
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256

 config MAINBOARD_DIR
--- a/src/mainboard/asus/Kconfig
+++ b/src/mainboard/asus/Kconfig
@@ -26,6 +26,7 @@ source "src/mainboard/asus/a8n_e/Kconfig"
 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"
--- a/src/mainboard/asus/a8n_e/Kconfig
+++ b/src/mainboard/asus/a8n_e/Kconfig
@@ -80,7 +80,7 @@ config MAX_PHYSICAL_CPUS

 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x20
 	depends on BOARD_ASUS_A8N_E

 config HT_CHAIN_UNITID_BASE
--- a/src/mainboard/asus/mew-am/Kconfig
+++ b/src/mainboard/asus/mew-am/Kconfig
@@ -27,7 +27,6 @@ config BOARD_ASUS_MEW_AM
 	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
--- a/src/mainboard/asus/mew-vm/Kconfig
+++ b/src/mainboard/asus/mew-vm/Kconfig
@@ -27,7 +27,6 @@ config BOARD_ASUS_MEW_VM
 	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
--- a/src/mainboard/asus/p2b-d/Kconfig
+++ b/src/mainboard/asus/p2b-d/Kconfig
@@ -29,7 +29,6 @@ config BOARD_ASUS_P2B_D
 	select HAVE_MP_TABLE
 	select SMP
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256

 config MAINBOARD_DIR
--- a/src/mainboard/asus/p2b-ds/Kconfig
+++ b/src/mainboard/asus/p2b-ds/Kconfig
@@ -29,7 +29,6 @@ config BOARD_ASUS_P2B_DS
 	select HAVE_MP_TABLE
 	select SMP
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256

 config MAINBOARD_DIR
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ b/src/mainboard/asus/p2b-f/Kconfig
@@ -27,7 +27,6 @@ config BOARD_ASUS_P2B_F
 	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
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -27,7 +27,6 @@ config BOARD_ASUS_P2B
 	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
--- a/src/mainboard/asus/p3b-f/Kconfig
+++ b/src/mainboard/asus/p3b-f/Kconfig
@@ -27,7 +27,6 @@ config BOARD_ASUS_P3B_F
 	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
--- a/src/mainboard/axus/tc320/Kconfig
+++ b/src/mainboard/axus/tc320/Kconfig
@@ -28,7 +28,6 @@ config BOARD_AXUS_TC320
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256

 config MAINBOARD_DIR
--- a/src/mainboard/azza/pt-6ibd/Kconfig
+++ b/src/mainboard/azza/pt-6ibd/Kconfig
@@ -27,7 +27,6 @@ config BOARD_AZZA_PT_6IBD
 	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
--- a/src/mainboard/bcom/winnet100/Kconfig
+++ b/src/mainboard/bcom/winnet100/Kconfig
@@ -28,7 +28,6 @@ config BOARD_BCOM_WINNET100
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256

 config MAINBOARD_DIR
--- a/src/mainboard/bcom/winnetp680/Kconfig
+++ b/src/mainboard/bcom/winnetp680/Kconfig
@@ -7,7 +7,6 @@ config BOARD_BCOM_WINNETP680
 	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
--- a/src/mainboard/biostar/m6tba/Kconfig
+++ b/src/mainboard/biostar/m6tba/Kconfig
@@ -27,7 +27,6 @@ config BOARD_BIOSTAR_M6TBA
 	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
--- a/src/mainboard/broadcom/blast/Kconfig
+++ b/src/mainboard/broadcom/blast/Kconfig
@@ -13,6 +13,7 @@ config BOARD_BROADCOM_BLAST
 	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 APIC_ID_OFFSET

 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
-	depends on BOARD_BROADCOM_BLAST
-
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
+	default 1
 	depends on BOARD_BROADCOM_BLAST

 config LB_CKS_RANGE_END
@@ -81,12 +77,12 @@ config MAX_PHYSICAL_CPUS

 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
--- a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
@@ -28,7 +28,6 @@ config BOARD_COMPAQ_DESKPRO_EN_SFF_P600
 	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
--- a/src/mainboard/dell/s1850/Kconfig
+++ b/src/mainboard/dell/s1850/Kconfig
@@ -44,12 +44,12 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID

 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
--- a/src/mainboard/digitallogic/msm586seg/Kconfig
+++ b/src/mainboard/digitallogic/msm586seg/Kconfig
@@ -3,7 +3,7 @@ config BOARD_DIGITALLOGIC_MSM586SEG
 	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
--- a/src/mainboard/digitallogic/msm800sev/Kconfig
+++ b/src/mainboard/digitallogic/msm800sev/Kconfig
@@ -8,7 +8,6 @@ config BOARD_DIGITALLOGIC_MSM800SEV
 	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
--- a/src/mainboard/eaglelion/5bcm/Kconfig
+++ b/src/mainboard/eaglelion/5bcm/Kconfig
@@ -28,7 +28,6 @@ config BOARD_EAGLELION_5BCM
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256

 config MAINBOARD_DIR
--- a/src/mainboard/gigabyte/ga-6bxc/Kconfig
+++ b/src/mainboard/gigabyte/ga-6bxc/Kconfig
@@ -27,7 +27,6 @@ config BOARD_GIGABYTE_GA_6BXC
 	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
--- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
@@ -11,7 +11,6 @@ config BOARD_GIGABYTE_GA_2761GXDK
 	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_UNITID_BASE

 config HT_CHAIN_END_UNITID_BASE
 	hex	
-	default 0x0
+	default 0x20
 	depends on BOARD_GIGABYTE_GA_2761GXDK

 config USE_INIT
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/src/mainboard/gigabyte/m57sli/Kconfig
@@ -13,7 +13,6 @@ config BOARD_GIGABYTE_M57SLI
 	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_UNITID_BASE

 config HT_CHAIN_END_UNITID_BASE
 	hex	
-	default 0x0
+	default 0x20
 	depends on BOARD_GIGABYTE_M57SLI

 config USE_INIT
--- a/src/mainboard/hp/dl145_g3/Kconfig
+++ b/src/mainboard/hp/dl145_g3/Kconfig
@@ -14,6 +14,7 @@ config BOARD_HP_DL145_G3
 	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 MAX_PHYSICAL_CPUS

 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
--- a/src/mainboard/hp/e_vectra_p2706t/Kconfig
+++ b/src/mainboard/hp/e_vectra_p2706t/Kconfig
@@ -30,7 +30,6 @@ config BOARD_HP_E_VECTRA_P2706T
 	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
--- a/src/mainboard/ibm/e325/Kconfig
+++ b/src/mainboard/ibm/e325/Kconfig
@@ -78,17 +78,17 @@ config HW_MEM_HOLE_SIZE_AUTO_INC

 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
--- a/src/mainboard/ibm/e326/Kconfig
+++ b/src/mainboard/ibm/e326/Kconfig
@@ -78,17 +78,17 @@ config HW_MEM_HOLE_SIZE_AUTO_INC

 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
--- a/src/mainboard/iei/juki-511p/Kconfig
+++ b/src/mainboard/iei/juki-511p/Kconfig
@@ -28,7 +28,6 @@ config BOARD_IEI_JUKI_511P
 	select PIRQ_ROUTE
 	select HAVE_OPTION_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256

 config MAINBOARD_DIR
--- a/src/mainboard/iei/nova4899r/Kconfig
+++ b/src/mainboard/iei/nova4899r/Kconfig
@@ -29,7 +29,6 @@ config BOARD_IEI_NOVA_4899R
 	select PIRQ_ROUTE
 	select HAVE_OPTION_TABLE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256

 config MAINBOARD_DIR
--- a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
+++ b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
@@ -8,7 +8,6 @@ config BOARD_IEI_PCISA_LX_800_R10
 	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
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -34,7 +34,7 @@ config BOARD_INTEL_D945GCLF
 	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 @@ config IRQ_SLOT_COUNT
 	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
--- a/src/mainboard/intel/eagleheights/Kconfig
+++ b/src/mainboard/intel/eagleheights/Kconfig
@@ -11,7 +11,6 @@ config BOARD_INTEL_EAGLEHEIGHTS
 	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 @@ config IRQ_SLOT_COUNT
 	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
--- a/src/mainboard/intel/mtarvon/Kconfig
+++ b/src/mainboard/intel/mtarvon/Kconfig
@@ -49,3 +49,8 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2680
 	depends on BOARD_INTEL_MTARVON
+
+config MAX_CPUS
+	int
+	default 4
+	depends on BOARD_INTEL_MTARVON
--- a/src/mainboard/intel/truxton/Kconfig
+++ b/src/mainboard/intel/truxton/Kconfig
@@ -51,3 +51,7 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	default 0x2680
 	depends on BOARD_INTEL_TRUXTON

+config MAX_CPUS
+	int
+	default 4
+	depends on BOARD_INTEL_TRUXTON
--- a/src/mainboard/iwill/dk8s2/Kconfig
+++ b/src/mainboard/iwill/dk8s2/Kconfig
@@ -64,7 +64,7 @@ config HW_MEM_HOLE_SIZEK

 config MAX_CPUS
 	int
-	default 4
+	default 2
 	depends on BOARD_IWILL_DK8S2

 config MAX_PHYSICAL_CPUS
@@ -79,17 +79,17 @@ config HW_MEM_HOLE_SIZE_AUTO_INC

 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
--- a/src/mainboard/iwill/dk8x/Kconfig
+++ b/src/mainboard/iwill/dk8x/Kconfig
@@ -63,7 +63,7 @@ config HW_MEM_HOLE_SIZEK

 config MAX_CPUS
 	int
-	default 4
+	default 2
 	depends on BOARD_IWILL_DK8X

 config MAX_PHYSICAL_CPUS
@@ -78,17 +78,17 @@ config HW_MEM_HOLE_SIZE_AUTO_INC

 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
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -62,6 +62,11 @@ config IRQ_SLOT_COUNT
 	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
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -15,7 +15,7 @@ config BOARD_KONTRON_KT690
 	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
--- a/src/mainboard/lippert/frontrunner/Kconfig
+++ b/src/mainboard/lippert/frontrunner/Kconfig
@@ -5,7 +5,6 @@ config BOARD_LIPPERT_FRONTRUNNER
 	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

--- a/src/mainboard/lippert/roadrunner-lx/Kconfig
+++ b/src/mainboard/lippert/roadrunner-lx/Kconfig
@@ -8,7 +8,6 @@ config BOARD_LIPPERT_ROADRUNNER_LX
 	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
--- a/src/mainboard/lippert/spacerunner-lx/Kconfig
+++ b/src/mainboard/lippert/spacerunner-lx/Kconfig
@@ -8,7 +8,6 @@ config BOARD_LIPPERT_SPACERUNNER_LX
 	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
--- a/src/mainboard/mitac/6513wu/Kconfig
+++ b/src/mainboard/mitac/6513wu/Kconfig
@@ -27,7 +27,6 @@ config BOARD_MITAC_6513WU
 	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
--- a/src/mainboard/msi/ms6119/Kconfig
+++ b/src/mainboard/msi/ms6119/Kconfig
@@ -27,7 +27,6 @@ config BOARD_MSI_MS_6119
 	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
--- a/src/mainboard/msi/ms6147/Kconfig
+++ b/src/mainboard/msi/ms6147/Kconfig
@@ -27,7 +27,6 @@ config BOARD_MSI_MS_6147
 	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
--- a/src/mainboard/msi/ms6156/Kconfig
+++ b/src/mainboard/msi/ms6156/Kconfig
@@ -27,7 +27,6 @@ config BOARD_MSI_MS_6156
 	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
--- a/src/mainboard/msi/ms7260/Kconfig
+++ b/src/mainboard/msi/ms7260/Kconfig
@@ -12,7 +12,6 @@ config BOARD_MSI_MS7260
 	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_UNITID_BASE

 config HT_CHAIN_END_UNITID_BASE
 	hex	
-	default 0x0
+	default 0x20
 	depends on BOARD_MSI_MS7260

 config USE_INIT
--- a/src/mainboard/msi/ms9185/Kconfig
+++ b/src/mainboard/msi/ms9185/Kconfig
@@ -14,6 +14,7 @@ config BOARD_MSI_MS9185
 	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 @@ config SB_HT_CHAIN_ON_BUS0
 	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 MAX_PHYSICAL_CPUS

 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 @@ config USE_INIT
 	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
--- a/src/mainboard/msi/ms9282/Kconfig
+++ b/src/mainboard/msi/ms9282/Kconfig
@@ -11,7 +11,6 @@ config BOARD_MSI_MS9282
 	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 APIC_ID_OFFSET

 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 HW_MEM_HOLE_SIZEK

 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_UNITID_BASE

 config HT_CHAIN_END_UNITID_BASE
 	hex	
-	default 0x0
+	default 0x20
 	depends on BOARD_MSI_MS9282

 config USE_INIT
--- a/src/mainboard/nec/powermate2000/Kconfig
+++ b/src/mainboard/nec/powermate2000/Kconfig
@@ -27,7 +27,6 @@ config BOARD_NEC_POWERMATE_2000
 	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
--- a/src/mainboard/newisys/khepri/Kconfig
+++ b/src/mainboard/newisys/khepri/Kconfig
@@ -13,6 +13,7 @@ config BOARD_NEWISYS_KHEPRI
 	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_NEWISYS_KHEPRI
-
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
+	default 0
 	depends on BOARD_NEWISYS_KHEPRI

 config LB_CKS_RANGE_END
@@ -81,12 +77,12 @@ config MAX_PHYSICAL_CPUS

 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
--- a/src/mainboard/nvidia/l1_2pvv/Kconfig
+++ b/src/mainboard/nvidia/l1_2pvv/Kconfig
@@ -12,7 +12,6 @@ config BOARD_NVIDIA_L1_2PVV
 	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_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_UNITID_BASE

 config HT_CHAIN_END_UNITID_BASE
 	hex	
-	default 0x0
+	default 0x20
 	depends on BOARD_NVIDIA_L1_2PVV

 config USE_INIT
--- a/src/mainboard/olpc/btest/Kconfig
+++ b/src/mainboard/olpc/btest/Kconfig
@@ -5,7 +5,6 @@ config BOARD_OLPC_BTEST
 	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

--- a/src/mainboard/olpc/rev_a/Kconfig
+++ b/src/mainboard/olpc/rev_a/Kconfig
@@ -5,7 +5,6 @@ config BOARD_OLPC_REV_A
 	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

--- a/src/mainboard/pcengines/alix1c/Kconfig
+++ b/src/mainboard/pcengines/alix1c/Kconfig
@@ -8,7 +8,6 @@ config BOARD_PCENGINES_ALIX1C
 	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
--- a/src/mainboard/rca/rm4100/Kconfig
+++ b/src/mainboard/rca/rm4100/Kconfig
@@ -7,7 +7,6 @@ config BOARD_RCA_RM4100
 	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
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -58,6 +58,11 @@ config IRQ_SLOT_COUNT
 	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
--- a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
@@ -27,7 +27,6 @@ config BOARD_SOYO_SY_6BA_PLUS_III
 	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
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/src/mainboard/sunw/ultra40/Kconfig
@@ -80,7 +80,7 @@ config MAX_PHYSICAL_CPUS

 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x20
 	depends on BOARD_SUNW_ULTRA40

 config HT_CHAIN_UNITID_BASE
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -87,7 +87,7 @@ config MAX_PHYSICAL_CPUS

 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x20
 	depends on BOARD_SUPERMICRO_H8DME

 config HT_CHAIN_UNITID_BASE
--- a/src/mainboard/supermicro/h8dmr/Kconfig
+++ b/src/mainboard/supermicro/h8dmr/Kconfig
@@ -12,7 +12,7 @@ config BOARD_SUPERMICRO_H8DMR
 	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 MAX_PHYSICAL_CPUS

 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x0
+	default 0x20
 	depends on BOARD_SUPERMICRO_H8DMR

 config HT_CHAIN_UNITID_BASE
--- a/src/mainboard/technexion/tim8690/Kconfig
+++ b/src/mainboard/technexion/tim8690/Kconfig
@@ -79,17 +79,17 @@ config HW_MEM_HOLE_SIZE_AUTO_INC

 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
--- a/src/mainboard/technologic/ts5300/Kconfig
+++ b/src/mainboard/technologic/ts5300/Kconfig
@@ -3,7 +3,7 @@ config BOARD_TECHNOLOGIC_TS5300
 	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
--- a/src/mainboard/televideo/tc7020/Kconfig
+++ b/src/mainboard/televideo/tc7020/Kconfig
@@ -28,7 +28,6 @@ config BOARD_TELEVIDEO_TC7020
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_256

 config MAINBOARD_DIR
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/src/mainboard/via/pc2500e/Kconfig
+++ b/src/mainboard/via/pc2500e/Kconfig
@@ -9,7 +9,6 @@ config BOARD_VIA_PC2500E
 	select HAVE_MP_TABLE
 	select SMP
 	select UDELAY_TSC
-	select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 	select BOARD_ROMSIZE_KB_512

 config MAINBOARD_DIR
--- a/src/mainboard/via/vt8454c/Kconfig
+++ b/src/mainboard/via/vt8454c/Kconfig
@@ -10,7 +10,7 @@ config BOARD_VIA_VT8454C
 #	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