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

diff --git a/src/Kconfig b/src/Kconfig
index 083553ffa0bf841d620354d108e0ac4ca35b2252..1625a0035de97f8646072e1d84484308d4697b0c 100644 (file)
--- 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 e9de728a196923de3dcc6b4be214ae9fa36112f4..d2e08cb998b19959d31cffef86e1a96b33b4603d 100644 (file)
--- 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 14abffda500220fedce73241e0eb24cb4f780fb7..188ba1c30f3eaed667bbee8fc44d5fb8a4db5944 100644 (file)
--- 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 010052f4ca70bdda55caff70c059f9b2edcfad88..3af08ec0460821e401cb4c3f2912172ae42a2802 100644 (file)
--- 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 2422d8af889096b9d7d4d7820a112b426bda2975..ce851e8d9fd4842368e77676e1f751208f1e7140 100644 (file)
--- 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 f67842061ba23afb00152f8dc012761744e29419..670854219e19eec64806ccfd9508226cec5bc45e 100644 (file)
--- 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 9411d879df27935d52d87ccbcc3649ef10a7e287..1bf3635084ff0821f1287aa1241084e692ef5fe9 100644 (file)
--- 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 949a6df1371c95b141be2c35308afc05f467e817..a371c3b580e709458d8f324985c24768b34bd83b 100644 (file)
--- 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 df0939243316ad57a2b1f50c0ccac0931e23a7c1..dcb9fc43e36520ba9d4a186a5c8d7047893091a2 100644 (file)
--- 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 a1e927c385811e51a280a2aa73fbb81a8e200f4f..fc6a94017bb136b60d76898c0b5fa36cd646715c 100644 (file)
--- 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 1f9be02d290b9de99a8307534568884f75079dee..98d7282542efabc7796ce2ec12d21ebf48fe25fc 100644 (file)
--- 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 d31ecadc319618fd73f79bfa73ed556325a434c5..5f4211dd33c082f1d357bc91ff80f59f3ee4626f 100644 (file)
--- 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 23c8aee66beeeb02c25b302630b7c23cb65600f0..524fe9bde3f532aec30528e1da7edeb03159806a 100644 (file)
--- 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 926f9faeb41f923948878373bb05344ca094109d..62554369b9c33571e314c8fcc4fff2e27b4970db 100644 (file)
--- 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 0c8dd83a64be3f0309cc53c8d5ce0c005496e207..92f1a4c2276aeef605f0f86566f37aa713d2b08f 100644 (file)
--- 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 9d9e24a7f4b6cbc5dd3e2dcfdde39aa84ca7adff..d5f90f23795c08aa7bea915ec346e81cf610e569 100644 (file)
--- 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 79fb6d6c71b7241084195dd32be8a5d1912eb8d3..76ee144082ccaab4934e1cf69f9140dcb7342384 100644 (file)
--- 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 14f8281fcca8dcccce84d090e109552e7024975c..a1eb773739a84b451d5f032d00cfa424cda913f9 100644 (file)
--- 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 1fa95d4b6440351943822a39f2190bcbe971e793..59fcdb4f2e9e0215893fa444b423765466107846 100644 (file)
--- 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 961a25a9c56b6d8c2c34e84a77ebdc81e58e9810..a531064eaefac77eba0152d56d2b4966229519b6 100644 (file)
--- 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 6c655ea3b8d452b5e891a97ba648efc741ba33f8..6ac6be2e2f997b20c768406a858e19ddb1a01b00 100644 (file)
--- 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 c7314db8f352b81cfacc98333e0e05cd110b38c7..f857153def870af3dee992065b3cc6228d87b285 100644 (file)
--- 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 43eec104222deb30beb8a8524b5d678976555909..674fd90286b271b7841b2cdfd5c9850c71b63700 100644 (file)
--- 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 ba789c6b7fcfdacc75bc9463887840b846e15250..3e9568b0b3a20934b028750962b90ad2e7722e93 100644 (file)
--- 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 ddbb587124f1d0757cb2a0ff7dce9f056d60f62d..dda9df78b66055e6592c1c5b683f4f6cd838b7ef 100644 (file)
--- 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 7ce75564212cdfa400388ca0acd4af958cc70491..35d00a35d143c3e1e54151783daa4f1fd648081d 100644 (file)
--- 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 c9264ffe04788eea16cd24a42fe6f815cb8429ad..a7e13ea1309f3381e3b762327b0e01f504dec70e 100644 (file)
--- 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 96c64a0b977e9cb5d834c0281ba1c529820d45ec..615d90794ff80075ff44aae87e4263d1fd124c44 100644 (file)
--- 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 51890231609d18d8fc6375ac1ddffc28d432b6fb..4c8be412cf0e818cf75545f7a749d1820cfbe6aa 100644 (file)
--- 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 1eda572916b907e1bb0f1ad891979f88ef06dc4f..95cef528daa92f2a9bfe2a623704b900c55b2f37 100644 (file)
--- 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 722f1f4608b5fb03b0e733887befc63268781adf..9d1611c593c6cc6b7b031aafd6e6591174acea3c 100644 (file)
--- 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 41b96a34480896319958050ac80d4a019fcdc1a3..72bff0e9b4d44f9054d44126bcfb252a0161a01a 100644 (file)
--- 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 5929304e4d906dacbd8bae33e19ca668ce62d97b..f14a67f26f0063bb18297f9207443f3e64574bda 100644 (file)
--- 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 b94b9922f0d5add5aad67c69c116a11574ea2216..92c11090053e9d261897d74200ba076c74cdec77 100644 (file)
--- 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 25ba24fc8b769ad820c8e9855fa13079529027ea..8c52218f768096d9ea3cae02b2b9c1e192c372f3 100644 (file)
--- 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 18dd71687081abd07eba7cbd464db9573f4d4b0e..94b2b5a0af2772da80be09f64e477a02934eae8a 100644 (file)
--- 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 3421430b66257089c730c2bc454cf244e8c9f0c6..dc1bfb1802333c2ec3af2d7a1632ece3caf4bac9 100644 (file)
--- 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 2c0ffc218f14e6afab790760af3c7909f0ca53bf..a5303a13988a9fec49adbca879b0d690a29e3190 100644 (file)
--- 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 1f7f9c514a4e00b4208c13dc6e3b997456c291c2..0cf1f5dc20f2bafc092f6392a522486cf220f1b1 100644 (file)
--- 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 af8d789144940805a3159da44c0527583c6f48e4..2dcc218538101934e68d40a21201c120781dd8c5 100644 (file)
--- 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 b72d76adcfa94f598022655a6bc2be47acb1c2b2..f122663fffe1c9285a411c602b6ee0f87f7a2203 100644 (file)
--- 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 672f19f6fd76bf435afb89df9dda036634458014..3531013782c1e2bffba9f7bfb201fc4a1619c725 100644 (file)
--- 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 41e239d5e576f5b18f055111ad08acaf400cb290..e04b16aad76a2fd9fbda88c4e56db1daa447bf3a 100644 (file)
--- 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 5d3fa04cb3558d87febbc03a023ff3de3cbd819c..769fa9d5c0c8acc732dc7f89065ec1f1e5949b0a 100644 (file)
--- 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 647f251997c5ae00308770bce8ab454966bf4f8f..80558457d5a22f8d7f3e1d4d971c5ec79a693607 100644 (file)
--- 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 92b184ec6eb4bf3ad753c0efa4b224c2613110e9..b03fab92f4b948b1133782d7e7a16ad38658581b 100644 (file)
--- 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 f26bb4a3688c288e8667d4572cf4be2831fcef89..ac32d8ce5fd57b60ffe267191329aa4690ab69ff 100644 (file)
--- 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