From 29647d97c5e66484ab5c8b56ede57329ab5410c4 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 25 Jan 2010 07:56:01 +0000 Subject: 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 Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5051 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/msi/ms6119/Kconfig | 1 - src/mainboard/msi/ms6147/Kconfig | 1 - src/mainboard/msi/ms6156/Kconfig | 1 - src/mainboard/msi/ms7260/Kconfig | 3 +-- src/mainboard/msi/ms9185/Kconfig | 15 +++------------ src/mainboard/msi/ms9282/Kconfig | 9 ++++----- 6 files changed, 8 insertions(+), 22 deletions(-) (limited to 'src/mainboard/msi') diff --git a/src/mainboard/msi/ms6119/Kconfig b/src/mainboard/msi/ms6119/Kconfig index 27dbe6b1dd..6c9cf55fc6 100644 --- 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 diff --git a/src/mainboard/msi/ms6147/Kconfig b/src/mainboard/msi/ms6147/Kconfig index 6c8e0921bd..7140479876 100644 --- 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 diff --git a/src/mainboard/msi/ms6156/Kconfig b/src/mainboard/msi/ms6156/Kconfig index 0ffb63851c..057cfc3b03 100644 --- 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 diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig index 6f8c34dfed..b2dc6a77b3 100644 --- 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 diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig index bbf5c39dba..413d1fa9c9 100644 --- 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 diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig index 31a993a8f1..ae10301c32 100644 --- 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 -- cgit v1.2.3