diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index 3d23f0c3db..8f60644395 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -25,7 +25,3 @@ config SMP
 	bool
 	default y if MAX_CPUS != 1
 	default n
-
-config CPU_SOCKET_TYPE
-	hex
-	default 0
diff --git a/src/cpu/amd/Kconfig b/src/cpu/amd/Kconfig
index 18ed8062c5..a1defb4441 100644
--- a/src/cpu/amd/Kconfig
+++ b/src/cpu/amd/Kconfig
@@ -1,3 +1,7 @@
+config K8_REV_F_SUPPORT
+	bool
+	default n
+
 #source src/cpu/amd/socket_754/Kconfig
 #source src/cpu/amd/socket_939/Kconfig
 source src/cpu/amd/socket_940/Kconfig
diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig
index 685d021c9c..3a316d9c46 100644
--- a/src/cpu/amd/model_fxx/Kconfig
+++ b/src/cpu/amd/model_fxx/Kconfig
@@ -1,3 +1,7 @@
+config CPU_AMD_MODEL_FXX
+	bool
+	default n
+
 config HAVE_INIT_TIMER
 	bool
 	default y
diff --git a/src/cpu/amd/socket_940/Kconfig b/src/cpu/amd/socket_940/Kconfig
index e477e1a643..0c026d7e34 100644
--- a/src/cpu/amd/socket_940/Kconfig
+++ b/src/cpu/amd/socket_940/Kconfig
@@ -1,11 +1,10 @@
 config CPU_AMD_SOCKET_940
 	bool
 	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
+config CPU_SOCKET_TYPE
+	hex
+	default 0x0
 	depends on CPU_AMD_SOCKET_940
diff --git a/src/cpu/amd/socket_AM2/Kconfig b/src/cpu/amd/socket_AM2/Kconfig
index c030f79bef..1298a505f8 100644
--- a/src/cpu/amd/socket_AM2/Kconfig
+++ b/src/cpu/amd/socket_AM2/Kconfig
@@ -4,6 +4,7 @@ config CPU_AMD_SOCKET_AM2
 	select K8_REV_F_SUPPORT
 	# Opteron K8 1G HT support
 	select K8_HT_FREQ_1G_SUPPORT
+	select CPU_AMD_MODEL_FXX
 
 config CPU_SOCKET_TYPE
 	hex
diff --git a/src/cpu/amd/socket_F/Kconfig b/src/cpu/amd/socket_F/Kconfig
index c0aad0f167..a0e44d9f3f 100644
--- a/src/cpu/amd/socket_F/Kconfig
+++ b/src/cpu/amd/socket_F/Kconfig
@@ -2,8 +2,8 @@ config CPU_AMD_SOCKET_F
 	bool
 	default n
 	select K8_REV_F_SUPPORT
-	# Opteron K8 1G HT support
 	select K8_HT_FREQ_1G_SUPPORT
+	select CPU_AMD_MODEL_FXX
 
 config CPU_SOCKET_TYPE
 	hex
diff --git a/src/cpu/amd/socket_S1G1/Kconfig b/src/cpu/amd/socket_S1G1/Kconfig
index 0e81cf5c95..603fd02a26 100644
--- a/src/cpu/amd/socket_S1G1/Kconfig
+++ b/src/cpu/amd/socket_S1G1/Kconfig
@@ -3,6 +3,7 @@ config CPU_AMD_SOCKET_S1G1
 	default n
 	select K8_REV_F_SUPPORT
 	select K8_HT_FREQ_1G_SUPPORT
+	select CPU_AMD_MODEL_FXX
 
 config CPU_SOCKET_TYPE
 	hex
diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig
index d33c069769..ad8d71ce7a 100644
--- a/src/northbridge/amd/amdk8/Kconfig
+++ b/src/northbridge/amd/amdk8/Kconfig
@@ -27,6 +27,11 @@ config AGP_APERTURE_SIZE
 	default 0x4000000
 	depends on NORTHBRIDGE_AMD_AMDK8
 
+config K8_HT_FREQ_1G_SUPPORT
+	bool
+	default n
+	depends on NORTHBRIDGE_AMD_AMDK8
+
 config HYPERTRANSPORT_PLUGIN_SUPPORT
 	bool
 	default y