cpu/intel/*/Kconfig: move selection of CPU_X86_CACHE_HELPER
Move the selection of CPU_X86_CACHE_HELPER to the Kconfig file of the CPU models which call the x86_enable_cache function that gets added to the build by selecting this option. Change-Id: Ie75682f5d20a79fc2f3aab9b8a2c3ccf79d1ad5c Signed-off-by: Angel Pons <th3fanbus@gmail.com> Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/44227 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
		@@ -2,3 +2,4 @@ config CPU_INTEL_MODEL_65X
 | 
				
			|||||||
	bool
 | 
						bool
 | 
				
			||||||
	select ARCH_X86
 | 
						select ARCH_X86
 | 
				
			||||||
	select SUPPORT_CPU_UCODE_IN_CBFS
 | 
						select SUPPORT_CPU_UCODE_IN_CBFS
 | 
				
			||||||
 | 
						select CPU_X86_CACHE_HELPER
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,3 +2,4 @@ config CPU_INTEL_MODEL_67X
 | 
				
			|||||||
	bool
 | 
						bool
 | 
				
			||||||
	select ARCH_X86
 | 
						select ARCH_X86
 | 
				
			||||||
	select SUPPORT_CPU_UCODE_IN_CBFS
 | 
						select SUPPORT_CPU_UCODE_IN_CBFS
 | 
				
			||||||
 | 
						select CPU_X86_CACHE_HELPER
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,3 +4,4 @@ config CPU_INTEL_MODEL_68X
 | 
				
			|||||||
	bool
 | 
						bool
 | 
				
			||||||
	select ARCH_X86
 | 
						select ARCH_X86
 | 
				
			||||||
	select SUPPORT_CPU_UCODE_IN_CBFS
 | 
						select SUPPORT_CPU_UCODE_IN_CBFS
 | 
				
			||||||
 | 
						select CPU_X86_CACHE_HELPER
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,3 +2,4 @@ config CPU_INTEL_MODEL_6BX
 | 
				
			|||||||
	bool
 | 
						bool
 | 
				
			||||||
	select ARCH_X86
 | 
						select ARCH_X86
 | 
				
			||||||
	select SUPPORT_CPU_UCODE_IN_CBFS
 | 
						select SUPPORT_CPU_UCODE_IN_CBFS
 | 
				
			||||||
 | 
						select CPU_X86_CACHE_HELPER
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,3 +9,4 @@ config CPU_INTEL_MODEL_6EX
 | 
				
			|||||||
	select SUPPORT_CPU_UCODE_IN_CBFS
 | 
						select SUPPORT_CPU_UCODE_IN_CBFS
 | 
				
			||||||
	select CPU_INTEL_COMMON
 | 
						select CPU_INTEL_COMMON
 | 
				
			||||||
	select CPU_INTEL_COMMON_TIMEBASE
 | 
						select CPU_INTEL_COMMON_TIMEBASE
 | 
				
			||||||
 | 
						select CPU_X86_CACHE_HELPER
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,3 +10,4 @@ config CPU_INTEL_MODEL_6FX
 | 
				
			|||||||
	select CPU_INTEL_COMMON
 | 
						select CPU_INTEL_COMMON
 | 
				
			||||||
	select CPU_INTEL_COMMON_TIMEBASE
 | 
						select CPU_INTEL_COMMON_TIMEBASE
 | 
				
			||||||
	select SETUP_XIP_CACHE
 | 
						select SETUP_XIP_CACHE
 | 
				
			||||||
 | 
						select CPU_X86_CACHE_HELPER
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,3 +2,4 @@ config CPU_INTEL_MODEL_6XX
 | 
				
			|||||||
	bool
 | 
						bool
 | 
				
			||||||
	select ARCH_X86
 | 
						select ARCH_X86
 | 
				
			||||||
	select SUPPORT_CPU_UCODE_IN_CBFS
 | 
						select SUPPORT_CPU_UCODE_IN_CBFS
 | 
				
			||||||
 | 
						select CPU_X86_CACHE_HELPER
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,3 +4,4 @@ config CPU_INTEL_MODEL_F2X
 | 
				
			|||||||
	select SUPPORT_CPU_UCODE_IN_CBFS
 | 
						select SUPPORT_CPU_UCODE_IN_CBFS
 | 
				
			||||||
	select SMM_ASEG
 | 
						select SMM_ASEG
 | 
				
			||||||
	select CPU_INTEL_COMMON
 | 
						select CPU_INTEL_COMMON
 | 
				
			||||||
 | 
						select CPU_X86_CACHE_HELPER
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,3 +3,4 @@ config CPU_INTEL_MODEL_F3X
 | 
				
			|||||||
	select ARCH_X86
 | 
						select ARCH_X86
 | 
				
			||||||
	select SUPPORT_CPU_UCODE_IN_CBFS
 | 
						select SUPPORT_CPU_UCODE_IN_CBFS
 | 
				
			||||||
	select CPU_INTEL_COMMON
 | 
						select CPU_INTEL_COMMON
 | 
				
			||||||
 | 
						select CPU_X86_CACHE_HELPER
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,3 +2,4 @@ config CPU_INTEL_MODEL_F4X
 | 
				
			|||||||
	bool
 | 
						bool
 | 
				
			||||||
	select ARCH_X86
 | 
						select ARCH_X86
 | 
				
			||||||
	select SUPPORT_CPU_UCODE_IN_CBFS
 | 
						select SUPPORT_CPU_UCODE_IN_CBFS
 | 
				
			||||||
 | 
						select CPU_X86_CACHE_HELPER
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,6 @@ config SLOT_SPECIFIC_OPTIONS
 | 
				
			|||||||
	select CPU_INTEL_MODEL_68X
 | 
						select CPU_INTEL_MODEL_68X
 | 
				
			||||||
	select CPU_INTEL_MODEL_6BX
 | 
						select CPU_INTEL_MODEL_6BX
 | 
				
			||||||
	select CPU_INTEL_MODEL_6XX
 | 
						select CPU_INTEL_MODEL_6XX
 | 
				
			||||||
	select CPU_X86_CACHE_HELPER
 | 
					 | 
				
			||||||
	select NO_SMM
 | 
						select NO_SMM
 | 
				
			||||||
	select UDELAY_TSC
 | 
						select UDELAY_TSC
 | 
				
			||||||
	select TSC_MONOTONIC_TIMER
 | 
						select TSC_MONOTONIC_TIMER
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@ if CPU_INTEL_SOCKET_441
 | 
				
			|||||||
config SOCKET_SPECIFIC_OPTIONS
 | 
					config SOCKET_SPECIFIC_OPTIONS
 | 
				
			||||||
	def_bool y
 | 
						def_bool y
 | 
				
			||||||
	select CPU_INTEL_MODEL_106CX
 | 
						select CPU_INTEL_MODEL_106CX
 | 
				
			||||||
	select CPU_X86_CACHE_HELPER
 | 
					 | 
				
			||||||
	select MMX
 | 
						select MMX
 | 
				
			||||||
	select SSE
 | 
						select SSE
 | 
				
			||||||
	select SETUP_XIP_CACHE
 | 
						select SETUP_XIP_CACHE
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,6 @@
 | 
				
			|||||||
config CPU_INTEL_SOCKET_BGA956
 | 
					config CPU_INTEL_SOCKET_BGA956
 | 
				
			||||||
	bool
 | 
						bool
 | 
				
			||||||
	select CPU_INTEL_MODEL_1067X
 | 
						select CPU_INTEL_MODEL_1067X
 | 
				
			||||||
	select CPU_X86_CACHE_HELPER
 | 
					 | 
				
			||||||
	select MMX
 | 
						select MMX
 | 
				
			||||||
	select SSE
 | 
						select SSE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,7 +8,6 @@ if CPU_INTEL_SOCKET_FCBGA559
 | 
				
			|||||||
config SOCKET_SPECIFIC_OPTIONS
 | 
					config SOCKET_SPECIFIC_OPTIONS
 | 
				
			||||||
	def_bool y
 | 
						def_bool y
 | 
				
			||||||
	select CPU_INTEL_MODEL_106CX
 | 
						select CPU_INTEL_MODEL_106CX
 | 
				
			||||||
	select CPU_X86_CACHE_HELPER
 | 
					 | 
				
			||||||
	select MMX
 | 
						select MMX
 | 
				
			||||||
	select SSE
 | 
						select SSE
 | 
				
			||||||
	select CPU_HAS_L2_ENABLE_MSR
 | 
						select CPU_HAS_L2_ENABLE_MSR
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,6 @@ config SOCKET_SPECIFIC_OPTIONS
 | 
				
			|||||||
#	select CPU_INTEL_MODEL_F6X
 | 
					#	select CPU_INTEL_MODEL_F6X
 | 
				
			||||||
#	select CPU_INTEL_MODEL_1066X
 | 
					#	select CPU_INTEL_MODEL_1066X
 | 
				
			||||||
	select CPU_INTEL_MODEL_1067X
 | 
						select CPU_INTEL_MODEL_1067X
 | 
				
			||||||
	select CPU_X86_CACHE_HELPER
 | 
					 | 
				
			||||||
	select MMX
 | 
						select MMX
 | 
				
			||||||
	select SSE
 | 
						select SSE
 | 
				
			||||||
	select SIPI_VECTOR_IN_ROM
 | 
						select SIPI_VECTOR_IN_ROM
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,6 @@ config SOCKET_SPECIFIC_OPTIONS
 | 
				
			|||||||
	def_bool y
 | 
						def_bool y
 | 
				
			||||||
	select CPU_INTEL_MODEL_6EX
 | 
						select CPU_INTEL_MODEL_6EX
 | 
				
			||||||
	select CPU_INTEL_MODEL_6FX
 | 
						select CPU_INTEL_MODEL_6FX
 | 
				
			||||||
	select CPU_X86_CACHE_HELPER
 | 
					 | 
				
			||||||
	select MMX
 | 
						select MMX
 | 
				
			||||||
	select SSE
 | 
						select SSE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@ if CPU_INTEL_SOCKET_MPGA604
 | 
				
			|||||||
config SOCKET_SPECIFIC_OPTIONS
 | 
					config SOCKET_SPECIFIC_OPTIONS
 | 
				
			||||||
	def_bool y
 | 
						def_bool y
 | 
				
			||||||
	select CPU_INTEL_MODEL_F2X
 | 
						select CPU_INTEL_MODEL_F2X
 | 
				
			||||||
	select CPU_X86_CACHE_HELPER
 | 
					 | 
				
			||||||
	select MMX
 | 
						select MMX
 | 
				
			||||||
	select SSE
 | 
						select SSE
 | 
				
			||||||
	select UDELAY_TSC
 | 
						select UDELAY_TSC
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,6 @@ config CPU_INTEL_SOCKET_P
 | 
				
			|||||||
	bool
 | 
						bool
 | 
				
			||||||
	select CPU_INTEL_MODEL_1067X
 | 
						select CPU_INTEL_MODEL_1067X
 | 
				
			||||||
	select CPU_INTEL_MODEL_6FX
 | 
						select CPU_INTEL_MODEL_6FX
 | 
				
			||||||
	select CPU_X86_CACHE_HELPER
 | 
					 | 
				
			||||||
	select MMX
 | 
						select MMX
 | 
				
			||||||
	select SSE
 | 
						select SSE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user