18 files changed, 10 insertions, 8 deletions
diff --git a/src/cpu/intel/model_65x/Kconfig b/src/cpu/intel/model_65x/Kconfig
index 6d41d94f57..42bdc3f3a8 100644
--- a/src/cpu/intel/model_65x/Kconfig
+++ b/src/cpu/intel/model_65x/Kconfig
@@ -2,3 +2,4 @@ config CPU_INTEL_MODEL_65X
 	bool
 	select ARCH_X86
 	select SUPPORT_CPU_UCODE_IN_CBFS
+	select CPU_X86_CACHE_HELPER
diff --git a/src/cpu/intel/model_67x/Kconfig b/src/cpu/intel/model_67x/Kconfig
index 26a303be01..da57caa2da 100644
--- a/src/cpu/intel/model_67x/Kconfig
+++ b/src/cpu/intel/model_67x/Kconfig
@@ -2,3 +2,4 @@ config CPU_INTEL_MODEL_67X
 	bool
 	select ARCH_X86
 	select SUPPORT_CPU_UCODE_IN_CBFS
+	select CPU_X86_CACHE_HELPER
diff --git a/src/cpu/intel/model_68x/Kconfig b/src/cpu/intel/model_68x/Kconfig
index 796290770f..0ab1e7af51 100644
--- a/src/cpu/intel/model_68x/Kconfig
+++ b/src/cpu/intel/model_68x/Kconfig
@@ -4,3 +4,4 @@ config CPU_INTEL_MODEL_68X
 	bool
 	select ARCH_X86
 	select SUPPORT_CPU_UCODE_IN_CBFS
+	select CPU_X86_CACHE_HELPER
diff --git a/src/cpu/intel/model_6bx/Kconfig b/src/cpu/intel/model_6bx/Kconfig
index 14274a3236..cb9d6f3677 100644
--- a/src/cpu/intel/model_6bx/Kconfig
+++ b/src/cpu/intel/model_6bx/Kconfig
@@ -2,3 +2,4 @@ config CPU_INTEL_MODEL_6BX
 	bool
 	select ARCH_X86
 	select SUPPORT_CPU_UCODE_IN_CBFS
+	select CPU_X86_CACHE_HELPER
diff --git a/src/cpu/intel/model_6ex/Kconfig b/src/cpu/intel/model_6ex/Kconfig
index c7d54c5f8c..37bfa14ad1 100644
--- a/src/cpu/intel/model_6ex/Kconfig
+++ b/src/cpu/intel/model_6ex/Kconfig
@@ -9,3 +9,4 @@ config CPU_INTEL_MODEL_6EX
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select CPU_INTEL_COMMON
 	select CPU_INTEL_COMMON_TIMEBASE
+	select CPU_X86_CACHE_HELPER
diff --git a/src/cpu/intel/model_6fx/Kconfig b/src/cpu/intel/model_6fx/Kconfig
index 499972600a..8e035608ad 100644
--- a/src/cpu/intel/model_6fx/Kconfig
+++ b/src/cpu/intel/model_6fx/Kconfig
@@ -10,3 +10,4 @@ config CPU_INTEL_MODEL_6FX
 	select CPU_INTEL_COMMON
 	select CPU_INTEL_COMMON_TIMEBASE
 	select SETUP_XIP_CACHE
+	select CPU_X86_CACHE_HELPER
diff --git a/src/cpu/intel/model_6xx/Kconfig b/src/cpu/intel/model_6xx/Kconfig
index e05cf89517..95e175e052 100644
--- a/src/cpu/intel/model_6xx/Kconfig
+++ b/src/cpu/intel/model_6xx/Kconfig
@@ -2,3 +2,4 @@ config CPU_INTEL_MODEL_6XX
 	bool
 	select ARCH_X86
 	select SUPPORT_CPU_UCODE_IN_CBFS
+	select CPU_X86_CACHE_HELPER
diff --git a/src/cpu/intel/model_f2x/Kconfig b/src/cpu/intel/model_f2x/Kconfig
index 672cf75517..3339b66b00 100644
--- a/src/cpu/intel/model_f2x/Kconfig
+++ b/src/cpu/intel/model_f2x/Kconfig
@@ -4,3 +4,4 @@ config CPU_INTEL_MODEL_F2X
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select SMM_ASEG
 	select CPU_INTEL_COMMON
+	select CPU_X86_CACHE_HELPER
diff --git a/src/cpu/intel/model_f3x/Kconfig b/src/cpu/intel/model_f3x/Kconfig
index b0a9f7ce64..943d9cc155 100644
--- a/src/cpu/intel/model_f3x/Kconfig
+++ b/src/cpu/intel/model_f3x/Kconfig
@@ -3,3 +3,4 @@ config CPU_INTEL_MODEL_F3X
 	select ARCH_X86
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select CPU_INTEL_COMMON
+	select CPU_X86_CACHE_HELPER
diff --git a/src/cpu/intel/model_f4x/Kconfig b/src/cpu/intel/model_f4x/Kconfig
index 550a978e85..4dd40384fb 100644
--- a/src/cpu/intel/model_f4x/Kconfig
+++ b/src/cpu/intel/model_f4x/Kconfig
@@ -2,3 +2,4 @@ config CPU_INTEL_MODEL_F4X
 	bool
 	select ARCH_X86
 	select SUPPORT_CPU_UCODE_IN_CBFS
+	select CPU_X86_CACHE_HELPER
diff --git a/src/cpu/intel/slot_1/Kconfig b/src/cpu/intel/slot_1/Kconfig
index 9cbe502654..c30e066444 100644
--- a/src/cpu/intel/slot_1/Kconfig
+++ b/src/cpu/intel/slot_1/Kconfig
@@ -12,7 +12,6 @@ config SLOT_SPECIFIC_OPTIONS
 	select CPU_INTEL_MODEL_68X
 	select CPU_INTEL_MODEL_6BX
 	select CPU_INTEL_MODEL_6XX
-	select CPU_X86_CACHE_HELPER
 	select NO_SMM
 	select UDELAY_TSC
 	select TSC_MONOTONIC_TIMER
diff --git a/src/cpu/intel/socket_441/Kconfig b/src/cpu/intel/socket_441/Kconfig
index 8df6fbd416..5b6ae7f61d 100644
--- a/src/cpu/intel/socket_441/Kconfig
+++ b/src/cpu/intel/socket_441/Kconfig
@@ -6,7 +6,6 @@ if CPU_INTEL_SOCKET_441
 config SOCKET_SPECIFIC_OPTIONS
 	def_bool y
 	select CPU_INTEL_MODEL_106CX
-	select CPU_X86_CACHE_HELPER
 	select MMX
 	select SSE
 	select SETUP_XIP_CACHE
diff --git a/src/cpu/intel/socket_BGA956/Kconfig b/src/cpu/intel/socket_BGA956/Kconfig
index 1cad83f43b..638653c162 100644
--- a/src/cpu/intel/socket_BGA956/Kconfig
+++ b/src/cpu/intel/socket_BGA956/Kconfig
@@ -1,7 +1,6 @@
 config CPU_INTEL_SOCKET_BGA956
 	bool
 	select CPU_INTEL_MODEL_1067X
-	select CPU_X86_CACHE_HELPER
 	select MMX
 	select SSE
 
diff --git a/src/cpu/intel/socket_FCBGA559/Kconfig b/src/cpu/intel/socket_FCBGA559/Kconfig
index 87c419fe48..5105f095e9 100644
--- a/src/cpu/intel/socket_FCBGA559/Kconfig
+++ b/src/cpu/intel/socket_FCBGA559/Kconfig
@@ -8,7 +8,6 @@ if CPU_INTEL_SOCKET_FCBGA559
 config SOCKET_SPECIFIC_OPTIONS
 	def_bool y
 	select CPU_INTEL_MODEL_106CX
-	select CPU_X86_CACHE_HELPER
 	select MMX
 	select SSE
 	select CPU_HAS_L2_ENABLE_MSR
diff --git a/src/cpu/intel/socket_LGA775/Kconfig b/src/cpu/intel/socket_LGA775/Kconfig
index f162599e77..0848d2648e 100644
--- a/src/cpu/intel/socket_LGA775/Kconfig
+++ b/src/cpu/intel/socket_LGA775/Kconfig
@@ -11,7 +11,6 @@ config SOCKET_SPECIFIC_OPTIONS
 #	select CPU_INTEL_MODEL_F6X
 #	select CPU_INTEL_MODEL_1066X
 	select CPU_INTEL_MODEL_1067X
-	select CPU_X86_CACHE_HELPER
 	select MMX
 	select SSE
 	select SIPI_VECTOR_IN_ROM
diff --git a/src/cpu/intel/socket_m/Kconfig b/src/cpu/intel/socket_m/Kconfig
index d3d81c5676..50eb7e3f0c 100644
--- a/src/cpu/intel/socket_m/Kconfig
+++ b/src/cpu/intel/socket_m/Kconfig
@@ -7,7 +7,6 @@ config SOCKET_SPECIFIC_OPTIONS
 	def_bool y
 	select CPU_INTEL_MODEL_6EX
 	select CPU_INTEL_MODEL_6FX
-	select CPU_X86_CACHE_HELPER
 	select MMX
 	select SSE
 
diff --git a/src/cpu/intel/socket_mPGA604/Kconfig b/src/cpu/intel/socket_mPGA604/Kconfig
index f95cd02f20..7b086990f7 100644
--- a/src/cpu/intel/socket_mPGA604/Kconfig
+++ b/src/cpu/intel/socket_mPGA604/Kconfig
@@ -6,7 +6,6 @@ if CPU_INTEL_SOCKET_MPGA604
 config SOCKET_SPECIFIC_OPTIONS
 	def_bool y
 	select CPU_INTEL_MODEL_F2X
-	select CPU_X86_CACHE_HELPER
 	select MMX
 	select SSE
 	select UDELAY_TSC
diff --git a/src/cpu/intel/socket_p/Kconfig b/src/cpu/intel/socket_p/Kconfig
index 9239fe71fd..a7c8ab1bb8 100644
--- a/src/cpu/intel/socket_p/Kconfig
+++ b/src/cpu/intel/socket_p/Kconfig
@@ -2,7 +2,6 @@ config CPU_INTEL_SOCKET_P
 	bool
 	select CPU_INTEL_MODEL_1067X
 	select CPU_INTEL_MODEL_6FX
-	select CPU_X86_CACHE_HELPER
 	select MMX
 	select SSE