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

13 files changed, 2 insertions, 13 deletions

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