summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2009-10-20 16:10:04 +0000
committerMyles Watson <mylesgw@gmail.com>2009-10-20 16:10:04 +0000
commit8f74c5878dde6b610b416a5950de3219532c0f83 (patch)
treeb11587707e696904ce28b7c32c0fb1cd6b6297ed
parent4e015eb67432b4d46003023cd4bc8c04282896e4 (diff)
Remove CONFIG_CPU_AMD_FAM10 & CONFIG_CPU_AMDK8 from mainboards. They should be
selected in sockets, and they aren't used yet. Add a couple of variables to src/Kconfig for lack of a better place so that their selects work. Add select statements according to newconfig for some variables that were defined but never selected in mainboard configs. Fix #if CONFIG_VGA==1 -> #if CONFIG_VGA. Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4816 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/Kconfig3
-rw-r--r--src/mainboard/amd/dbm690t/Kconfig1
-rw-r--r--src/mainboard/amd/pistachio/Kconfig1
-rw-r--r--src/mainboard/amd/serengeti_cheetah/Kconfig2
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/Kconfig1
-rw-r--r--src/mainboard/arima/hdama/Kconfig1
-rw-r--r--src/mainboard/asus/a8n_e/Kconfig1
-rw-r--r--src/mainboard/asus/a8v-e_se/Kconfig1
-rw-r--r--src/mainboard/asus/m2v-mx_se/Kconfig2
-rw-r--r--src/mainboard/broadcom/blast/Kconfig1
-rw-r--r--src/mainboard/emulation/qemu-x86/Kconfig1
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/Kconfig2
-rw-r--r--src/mainboard/gigabyte/m57sli/Kconfig2
-rw-r--r--src/mainboard/hp/dl145_g3/Kconfig2
-rw-r--r--src/mainboard/ibm/e325/Kconfig1
-rw-r--r--src/mainboard/ibm/e326/Kconfig1
-rw-r--r--src/mainboard/intel/jarrell/Kconfig1
-rw-r--r--src/mainboard/iwill/dk8_htx/Kconfig2
-rw-r--r--src/mainboard/iwill/dk8s2/Kconfig1
-rw-r--r--src/mainboard/iwill/dk8x/Kconfig1
-rw-r--r--src/mainboard/kontron/986lcd-m/Kconfig2
-rw-r--r--src/mainboard/kontron/kt690/Kconfig1
-rw-r--r--src/mainboard/msi/ms7135/Kconfig1
-rw-r--r--src/mainboard/msi/ms7260/Kconfig2
-rw-r--r--src/mainboard/msi/ms9185/Kconfig2
-rw-r--r--src/mainboard/msi/ms9282/Kconfig1
-rw-r--r--src/mainboard/newisys/khepri/Kconfig1
-rw-r--r--src/mainboard/nvidia/l1_2pvv/Kconfig2
-rw-r--r--src/mainboard/sunw/ultra40/Kconfig1
-rw-r--r--src/mainboard/supermicro/h8dme/Kconfig2
-rw-r--r--src/mainboard/supermicro/h8dmr/Kconfig2
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/Kconfig2
-rw-r--r--src/mainboard/technexion/tim5690/Kconfig1
-rw-r--r--src/mainboard/technexion/tim8690/Kconfig1
-rw-r--r--src/mainboard/tyan/s2850/Kconfig1
-rw-r--r--src/mainboard/tyan/s2875/Kconfig1
-rw-r--r--src/mainboard/tyan/s2880/Kconfig1
-rw-r--r--src/mainboard/tyan/s2881/Kconfig1
-rw-r--r--src/mainboard/tyan/s2882/Kconfig1
-rw-r--r--src/mainboard/tyan/s2885/Kconfig1
-rw-r--r--src/mainboard/tyan/s2891/Kconfig1
-rw-r--r--src/mainboard/tyan/s2892/Kconfig1
-rw-r--r--src/mainboard/tyan/s2895/Kconfig1
-rw-r--r--src/mainboard/tyan/s2912/Kconfig2
-rw-r--r--src/mainboard/tyan/s2912_fam10/Kconfig2
-rw-r--r--src/mainboard/tyan/s4880/Kconfig1
-rw-r--r--src/mainboard/tyan/s4882/Kconfig1
47 files changed, 20 insertions, 44 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 083553ffa0..1625a0035d 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -406,3 +406,6 @@ config GDB_STUB
endmenu
+config LIFT_BSP_APIC_ID
+ bool
+ default n
diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig
index e9de728a19..d2e08cb998 100644
--- a/src/mainboard/amd/dbm690t/Kconfig
+++ b/src/mainboard/amd/dbm690t/Kconfig
@@ -1,7 +1,6 @@
config BOARD_AMD_DBM690T
bool "DBM690T (Herring)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_S1G1
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig
index 14abffda50..188ba1c30f 100644
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/src/mainboard/amd/pistachio/Kconfig
@@ -1,7 +1,6 @@
config BOARD_AMD_PISTACHIO
bool "Pistachio"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_AM2
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index 010052f4ca..3af08ec046 100644
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -1,7 +1,6 @@
config BOARD_AMD_SERENGETI_CHEETAH
bool "Serengeti Cheetah"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_F
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -14,6 +13,7 @@ config BOARD_AMD_SERENGETI_CHEETAH
select USE_DCACHE_RAM
select HAVE_HARD_RESET
select IOAPIC
+ select LIFT_BSP_APIC_ID
select MEM_TRAIN_SEQ
select AP_CODE_IN_CAR
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index 2422d8af88..ce851e8d9f 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -1,7 +1,6 @@
config BOARD_AMD_SERENGETI_CHEETAH_FAM10
bool "Serengeti Cheetah (Fam10)"
select ARCH_X86
- select CPU_AMD_FAM10
select CPU_AMD_SOCKET_F_1207
select NORTHBRIDGE_AMD_AMDFAM10
select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
diff --git a/src/mainboard/arima/hdama/Kconfig b/src/mainboard/arima/hdama/Kconfig
index f67842061b..670854219e 100644
--- a/src/mainboard/arima/hdama/Kconfig
+++ b/src/mainboard/arima/hdama/Kconfig
@@ -1,7 +1,6 @@
config BOARD_ARIMA_HDAMA
bool "HDAMA"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig
index 9411d879df..1bf3635084 100644
--- a/src/mainboard/asus/a8n_e/Kconfig
+++ b/src/mainboard/asus/a8n_e/Kconfig
@@ -1,7 +1,6 @@
config BOARD_ASUS_A8N_E
bool "A8N-E"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_939
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index 949a6df137..a371c3b580 100644
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -1,7 +1,6 @@
config BOARD_ASUS_A8V_E_SE
bool "A8V-E SE"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_939
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index df09392433..dcb9fc43e3 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -21,7 +21,6 @@
config BOARD_ASUS_M2V_MX_SE
bool "M2V-MX SE"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_AM2
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -35,6 +34,7 @@ config BOARD_ASUS_M2V_MX_SE
select HAVE_OPTION_TABLE
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_512
+ select VGA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig
index a1e927c385..fc6a94017b 100644
--- a/src/mainboard/broadcom/blast/Kconfig
+++ b/src/mainboard/broadcom/blast/Kconfig
@@ -1,7 +1,6 @@
config BOARD_BROADCOM_BLAST
bool "Blast"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-x86/Kconfig
index 1f9be02d29..98d7282542 100644
--- a/src/mainboard/emulation/qemu-x86/Kconfig
+++ b/src/mainboard/emulation/qemu-x86/Kconfig
@@ -1,7 +1,6 @@
config BOARD_EMULATION_QEMU_X86
bool "QEMU x86"
select ARCH_X86
- select CPU_I586
select SOUTHBRIDGE_INTEL_I82371EB
select CPU_EMULATION_QEMU_X86
select HAVE_PIRQ_TABLE
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
index d31ecadc31..5f4211dd33 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
@@ -1,7 +1,6 @@
config BOARD_GIGABYTE_GA_2761GXDK
bool "GA-2761GXDK"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_AM2
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -12,6 +11,7 @@ config BOARD_GIGABYTE_GA_2761GXDK
select USE_DCACHE_RAM
select HAVE_HARD_RESET
select IOAPIC
+ select LIFT_BSP_APIC_ID
select MEM_TRAIN_SEQ
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select K8_REV_F_SUPPORT
diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig
index 23c8aee66b..524fe9bde3 100644
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/src/mainboard/gigabyte/m57sli/Kconfig
@@ -1,7 +1,6 @@
config BOARD_GIGABYTE_M57SLI
bool "GA-M57SLI-S4"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_AM2
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -14,6 +13,7 @@ config BOARD_GIGABYTE_M57SLI
select USE_DCACHE_RAM
select HAVE_HARD_RESET
select IOAPIC
+ select LIFT_BSP_APIC_ID
select MEM_TRAIN_SEQ
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select HAVE_ACPI_TABLES
diff --git a/src/mainboard/hp/dl145_g3/Kconfig b/src/mainboard/hp/dl145_g3/Kconfig
index 926f9faeb4..62554369b9 100644
--- a/src/mainboard/hp/dl145_g3/Kconfig
+++ b/src/mainboard/hp/dl145_g3/Kconfig
@@ -1,7 +1,6 @@
config BOARD_HP_DL145_G3
bool "ProLiant DL145 G3"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_F
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -14,6 +13,7 @@ config BOARD_HP_DL145_G3
select USE_DCACHE_RAM
select HAVE_HARD_RESET
select IOAPIC
+ select LIFT_BSP_APIC_ID
select BOARD_ROMSIZE_KB_512
config MAINBOARD_DIR
diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig
index 0c8dd83a64..92f1a4c227 100644
--- a/src/mainboard/ibm/e325/Kconfig
+++ b/src/mainboard/ibm/e325/Kconfig
@@ -1,7 +1,6 @@
config BOARD_IBM_E325
bool "eServer 325"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig
index 9d9e24a7f4..d5f90f2379 100644
--- a/src/mainboard/ibm/e326/Kconfig
+++ b/src/mainboard/ibm/e326/Kconfig
@@ -1,7 +1,6 @@
config BOARD_IBM_E326
bool "eServer 326"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/intel/jarrell/Kconfig b/src/mainboard/intel/jarrell/Kconfig
index 79fb6d6c71..76ee144082 100644
--- a/src/mainboard/intel/jarrell/Kconfig
+++ b/src/mainboard/intel/jarrell/Kconfig
@@ -9,6 +9,7 @@ config BOARD_INTEL_JARRELL
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select UDELAY_TSC
+ select USE_WATCHDOG_ON_BOOT
select ATI_RAGE_XL
select BOARD_ROMSIZE_KB_2048
diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig
index 14f8281fcc..a1eb773739 100644
--- a/src/mainboard/iwill/dk8_htx/Kconfig
+++ b/src/mainboard/iwill/dk8_htx/Kconfig
@@ -1,7 +1,6 @@
config BOARD_IWILL_DK8_HTX
bool "DK8-HTX"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -14,6 +13,7 @@ config BOARD_IWILL_DK8_HTX
select USE_DCACHE_RAM
select HAVE_HARD_RESET
select IOAPIC
+ select LIFT_BSP_APIC_ID
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select WAIT_BEFORE_CPUS_INIT
select HAVE_ACPI_TABLES
diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig
index 1fa95d4b64..59fcdb4f2e 100644
--- a/src/mainboard/iwill/dk8s2/Kconfig
+++ b/src/mainboard/iwill/dk8s2/Kconfig
@@ -1,7 +1,6 @@
config BOARD_IWILL_DK8S2
bool "DK8S2"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig
index 961a25a9c5..a531064eae 100644
--- a/src/mainboard/iwill/dk8x/Kconfig
+++ b/src/mainboard/iwill/dk8x/Kconfig
@@ -1,7 +1,6 @@
config BOARD_IWILL_DK8X
bool "DK8X"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index 6c655ea3b8..6ac6be2e2f 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -11,7 +11,9 @@ config BOARD_KONTRON_986LCD_M
select MMCONF_SUPPORT
select USE_PRINTK_IN_CAR
select AP_IN_SIPI_WAIT
+ select UDELAY_LAPIC
select HAVE_ACPI_TABLES
+ select HAVE_SMI_HANDLER
select BOARD_ROMSIZE_KB_1024
config MAINBOARD_DIR
diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig
index c7314db8f3..f857153def 100644
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -1,7 +1,6 @@
config BOARD_KONTRON_KT690
bool "KT690/mITX"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_S1G1
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig
index 43eec10422..674fd90286 100644
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/src/mainboard/msi/ms7135/Kconfig
@@ -1,7 +1,6 @@
config BOARD_MSI_MS7135
bool "MS-7135 (K8N Neo3)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_754
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig
index ba789c6b7f..3e9568b0b3 100644
--- a/src/mainboard/msi/ms7260/Kconfig
+++ b/src/mainboard/msi/ms7260/Kconfig
@@ -1,7 +1,6 @@
config BOARD_MSI_MS7260
bool "MS-7260 (K9N Neo)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_AM2
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -13,6 +12,7 @@ config BOARD_MSI_MS7260
select USE_DCACHE_RAM
select HAVE_HARD_RESET
select IOAPIC
+ select LIFT_BSP_APIC_ID
select MEM_TRAIN_SEQ
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select K8_REV_F_SUPPORT
diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig
index ddbb587124..dda9df78b6 100644
--- a/src/mainboard/msi/ms9185/Kconfig
+++ b/src/mainboard/msi/ms9185/Kconfig
@@ -1,7 +1,6 @@
config BOARD_MSI_MS9185
bool "MS-9185 (K9SD Master-S2R)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_F
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -15,6 +14,7 @@ config BOARD_MSI_MS9185
select HAVE_HARD_RESET
select HAVE_ACPI_TABLES
select IOAPIC
+ select LIFT_BSP_APIC_ID
select BOARD_ROMSIZE_KB_512
config MAINBOARD_DIR
diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig
index 7ce7556421..35d00a35d1 100644
--- a/src/mainboard/msi/ms9282/Kconfig
+++ b/src/mainboard/msi/ms9282/Kconfig
@@ -1,7 +1,6 @@
config BOARD_MSI_MS9282
bool "MS-9282 (K9SD Master)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_F
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig
index c9264ffe04..a7e13ea130 100644
--- a/src/mainboard/newisys/khepri/Kconfig
+++ b/src/mainboard/newisys/khepri/Kconfig
@@ -1,7 +1,6 @@
config BOARD_NEWISYS_KHEPRI
bool "Khephri - 2100 Server (SUN Fire v20z)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/nvidia/l1_2pvv/Kconfig b/src/mainboard/nvidia/l1_2pvv/Kconfig
index 96c64a0b97..615d90794f 100644
--- a/src/mainboard/nvidia/l1_2pvv/Kconfig
+++ b/src/mainboard/nvidia/l1_2pvv/Kconfig
@@ -1,7 +1,6 @@
config BOARD_NVIDIA_L1_2PVV
bool "l1_2pvv"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_F
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -13,6 +12,7 @@ config BOARD_NVIDIA_L1_2PVV
select USE_DCACHE_RAM
select HAVE_HARD_RESET
select IOAPIC
+ select LIFT_BSP_APIC_ID
select MEM_TRAIN_SEQ
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select K8_REV_F_SUPPORT
diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig
index 5189023160..4c8be412cf 100644
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/src/mainboard/sunw/ultra40/Kconfig
@@ -1,7 +1,6 @@
config BOARD_SUNW_ULTRA40
bool "Ultra 40"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index 1eda572916..95cef528da 100644
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -1,7 +1,6 @@
config BOARD_SUPERMICRO_H8DME
bool "H8DME-2"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_F
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -14,6 +13,7 @@ config BOARD_SUPERMICRO_H8DME
select HAVE_HARD_RESET
select AP_CODE_IN_CAR
select IOAPIC
+ select LIFT_BSP_APIC_ID
select BOARD_ROMSIZE_KB_1024
config MAINBOARD_DIR
diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig
index 722f1f4608..9d1611c593 100644
--- a/src/mainboard/supermicro/h8dmr/Kconfig
+++ b/src/mainboard/supermicro/h8dmr/Kconfig
@@ -1,7 +1,6 @@
config BOARD_SUPERMICRO_H8DMR
bool "H8DMR-i2"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_F
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -13,6 +12,7 @@ config BOARD_SUPERMICRO_H8DMR
select USE_DCACHE_RAM
select HAVE_HARD_RESET
select IOAPIC
+ select LIFT_BSP_APIC_ID
select BOARD_ROMSIZE_KB_512
config MAINBOARD_DIR
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index 41b96a3448..72bff0e9b4 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -1,7 +1,6 @@
config BOARD_SUPERMICRO_H8DMR_FAM10
bool "H8DMR-i2 (Fam10)"
select ARCH_X86
- select CPU_AMD_FAM10
select CPU_AMD_SOCKET_F_1207
select NORTHBRIDGE_AMD_AMDFAM10
select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
@@ -13,6 +12,7 @@ config BOARD_SUPERMICRO_H8DMR_FAM10
select USE_DCACHE_RAM
select HAVE_HARD_RESET
select IOAPIC
+ select LIFT_BSP_APIC_ID
select AMDMCT
select BOARD_ROMSIZE_KB_1024
diff --git a/src/mainboard/technexion/tim5690/Kconfig b/src/mainboard/technexion/tim5690/Kconfig
index 5929304e4d..f14a67f26f 100644
--- a/src/mainboard/technexion/tim5690/Kconfig
+++ b/src/mainboard/technexion/tim5690/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TECHNEXION_TIM5690
bool "TIM-5690"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_S1G1
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/technexion/tim8690/Kconfig b/src/mainboard/technexion/tim8690/Kconfig
index b94b9922f0..92c1109005 100644
--- a/src/mainboard/technexion/tim8690/Kconfig
+++ b/src/mainboard/technexion/tim8690/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TECHNEXION_TIM8690
bool "TIM-8690"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_S1G1
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/tyan/s2850/Kconfig b/src/mainboard/tyan/s2850/Kconfig
index 25ba24fc8b..8c52218f76 100644
--- a/src/mainboard/tyan/s2850/Kconfig
+++ b/src/mainboard/tyan/s2850/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S2850
bool "S2850 (Tomcat K8S)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/tyan/s2875/Kconfig b/src/mainboard/tyan/s2875/Kconfig
index 18dd716870..94b2b5a0af 100644
--- a/src/mainboard/tyan/s2875/Kconfig
+++ b/src/mainboard/tyan/s2875/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S2875
bool "S2875 (Tiger K8W)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/tyan/s2880/Kconfig b/src/mainboard/tyan/s2880/Kconfig
index 3421430b66..dc1bfb1802 100644
--- a/src/mainboard/tyan/s2880/Kconfig
+++ b/src/mainboard/tyan/s2880/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S2880
bool "S2880 (Thunder K8SR)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig
index 2c0ffc218f..a5303a1398 100644
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S2881
bool "S2881 (Thunder K8SR)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/tyan/s2882/Kconfig b/src/mainboard/tyan/s2882/Kconfig
index 1f7f9c514a..0cf1f5dc20 100644
--- a/src/mainboard/tyan/s2882/Kconfig
+++ b/src/mainboard/tyan/s2882/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S2882
bool "S2882 (Thunder K8SR)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/tyan/s2885/Kconfig b/src/mainboard/tyan/s2885/Kconfig
index af8d789144..2dcc218538 100644
--- a/src/mainboard/tyan/s2885/Kconfig
+++ b/src/mainboard/tyan/s2885/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S2885
bool "S2885 (Thunder K8SR)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig
index b72d76adcf..f122663fff 100644
--- a/src/mainboard/tyan/s2891/Kconfig
+++ b/src/mainboard/tyan/s2891/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S2891
bool "S2891 (Thunder K8SRE)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig
index 672f19f6fd..3531013782 100644
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S2892
bool "S2892 (Thunder K8SE)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig
index 41e239d5e5..e04b16aad7 100644
--- a/src/mainboard/tyan/s2895/Kconfig
+++ b/src/mainboard/tyan/s2895/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S2895
bool "S2895 (Thunder K8WE)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig
index 5d3fa04cb3..769fa9d5c0 100644
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/src/mainboard/tyan/s2912/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S2912
bool "S2912 (Thunder n3600R)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_F
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -13,6 +12,7 @@ config BOARD_TYAN_S2912
select USE_DCACHE_RAM
select HAVE_HARD_RESET
select IOAPIC
+ select LIFT_BSP_APIC_ID
select MEM_TRAIN_SEQ
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select K8_REV_F_SUPPORT
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index 647f251997..80558457d5 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S2912_FAM10
bool "S2912 Fam10 (Thunder n3600R)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_F_1207
select NORTHBRIDGE_AMD_AMDFAM10
select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
@@ -13,6 +12,7 @@ config BOARD_TYAN_S2912_FAM10
select USE_DCACHE_RAM
select HAVE_HARD_RESET
select IOAPIC
+ select LIFT_BSP_APIC_ID
select MEM_TRAIN_SEQ
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select BOARD_ROMSIZE_KB_1024
diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig
index 92b184ec6e..b03fab92f4 100644
--- a/src/mainboard/tyan/s4880/Kconfig
+++ b/src/mainboard/tyan/s4880/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S4880
bool "S4880 (Thunder K8QS)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig
index f26bb4a368..ac32d8ce5f 100644
--- a/src/mainboard/tyan/s4882/Kconfig
+++ b/src/mainboard/tyan/s4882/Kconfig
@@ -1,7 +1,6 @@
config BOARD_TYAN_S4882
bool "S4882 (Thunder K8QS Pro)"
select ARCH_X86
- select CPU_AMD_K8
select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX