4 files changed, 15 insertions, 47 deletions

diff --git a/src/cpu/amd/socket_940/Kconfig b/src/cpu/amd/socket_940/Kconfig
index 260d360faf..e477e1a643 100644
--- a/src/cpu/amd/socket_940/Kconfig
+++ b/src/cpu/amd/socket_940/Kconfig
@@ -1,19 +1,11 @@
 config CPU_AMD_SOCKET_940
 	bool
-	default false
+	default n
+	#Opteron K8 1G HT Support
+	select K8_HT_FREQ_1G_SUPPORT
+	select CPU_AMD_MODEL_FXX
 
 config K8_REV_F_SUPPORT
 	bool
 	default n
 	depends on CPU_AMD_SOCKET_940
-
-#Opteron K8 1G HT Support
-config K8_HT_FREQ_1G_SUPPORT
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_940
-
-config CPU_AMD_MODEL_FXX
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_940
diff --git a/src/cpu/amd/socket_AM2/Kconfig b/src/cpu/amd/socket_AM2/Kconfig
index 6e2cd1c84c..c030f79bef 100644
--- a/src/cpu/amd/socket_AM2/Kconfig
+++ b/src/cpu/amd/socket_AM2/Kconfig
@@ -1,23 +1,15 @@
 config CPU_AMD_SOCKET_AM2
 	bool
-	default false
+	default n
+	select K8_REV_F_SUPPORT
+	# Opteron K8 1G HT support
+	select K8_HT_FREQ_1G_SUPPORT
 
 config CPU_SOCKET_TYPE
 	hex
 	default 0x11
 	depends on CPU_AMD_SOCKET_AM2
 
-config K8_REV_F_SUPPORT
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_AM2
-
-# Opteron K8 1G HT support
-config K8_HT_FREQ_1G_SUPPORT
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_AM2
-
 # DDR2 and REG
 config DIMM_SUPPORT
 	hex
diff --git a/src/cpu/amd/socket_F/Kconfig b/src/cpu/amd/socket_F/Kconfig
index 4cf6eac654..c0aad0f167 100644
--- a/src/cpu/amd/socket_F/Kconfig
+++ b/src/cpu/amd/socket_F/Kconfig
@@ -1,23 +1,15 @@
 config CPU_AMD_SOCKET_F
 	bool
-	default false
+	default n
+	select K8_REV_F_SUPPORT
+	# Opteron K8 1G HT support
+	select K8_HT_FREQ_1G_SUPPORT
 
 config CPU_SOCKET_TYPE
 	hex
 	default 0x10
 	depends on CPU_AMD_SOCKET_F
 
-config K8_REV_F_SUPPORT
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_F
-
-# Opteron K8 1G HT support
-config K8_HT_FREQ_1G_SUPPORT
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_F
-
 # DDR2 and REG
 config DIMM_SUPPORT
 	hex
diff --git a/src/cpu/amd/socket_S1G1/Kconfig b/src/cpu/amd/socket_S1G1/Kconfig
index a894506a59..0e81cf5c95 100644
--- a/src/cpu/amd/socket_S1G1/Kconfig
+++ b/src/cpu/amd/socket_S1G1/Kconfig
@@ -1,22 +1,14 @@
 config CPU_AMD_SOCKET_S1G1
         bool
-	default false
-
-config K8_REV_F_SUPPORT
-	bool
-	default true
-	depends on CPU_AMD_SOCKET_S1G1
+	default n
+	select K8_REV_F_SUPPORT
+	select K8_HT_FREQ_1G_SUPPORT
 
 config CPU_SOCKET_TYPE
 	hex
 	default 0x12
 	depends on CPU_AMD_SOCKET_S1G1
 
-config K8_HT_FREQ_1G_SUPPORT
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_S1G1
-
 #DDR2 and REG, S1G1
 config DIMM_SUPPORT
 	hex