Angel Pons has uploaded this change for review.

View Change

src: Select `CPU_X86_TSC` through `UDELAY_TSC`

The `CPU_X86_TSC` option does nothing if `UDELAY_TSC` is not enabled.

Change-Id: Id2c55cc1b9e284694fff670a238c3c620f0f6c47
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
---
M src/cpu/intel/haswell/Kconfig
M src/cpu/intel/model_2065x/Kconfig
M src/cpu/intel/model_206ax/Kconfig
M src/cpu/intel/slot_1/Kconfig
M src/cpu/intel/socket_mPGA604/Kconfig
M src/cpu/qemu-x86/Kconfig
M src/cpu/x86/Kconfig
M src/soc/amd/picasso/Kconfig
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/baytrail/Kconfig
M src/soc/intel/braswell/Kconfig
M src/soc/intel/broadwell/Kconfig
M src/soc/intel/cannonlake/Kconfig
M src/soc/intel/denverton_ns/Kconfig
M src/soc/intel/icelake/Kconfig
M src/soc/intel/jasperlake/Kconfig
M src/soc/intel/quark/Kconfig
M src/soc/intel/skylake/Kconfig
M src/soc/intel/tigerlake/Kconfig
M src/soc/intel/xeon_sp/Kconfig
20 files changed, 1 insertion(+), 19 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/44311/1

diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig
index 6f84c99..e234cab 100644
--- a/src/cpu/intel/haswell/Kconfig
+++ b/src/cpu/intel/haswell/Kconfig
@@ -13,7 +13,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select MMX
 	select SSE2
 	select UDELAY_TSC
diff --git a/src/cpu/intel/model_2065x/Kconfig b/src/cpu/intel/model_2065x/Kconfig
index d59afe9..9a7f6bb 100644
--- a/src/cpu/intel/model_2065x/Kconfig
+++ b/src/cpu/intel/model_2065x/Kconfig
@@ -13,7 +13,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select SSE2
 	select UDELAY_TSC
 	select TSC_MONOTONIC_TIMER
diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig
index 239978d..cfb12d9 100644
--- a/src/cpu/intel/model_206ax/Kconfig
+++ b/src/cpu/intel/model_206ax/Kconfig
@@ -13,7 +13,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select MMX
 	select SSE2
 	select UDELAY_TSC
diff --git a/src/cpu/intel/slot_1/Kconfig b/src/cpu/intel/slot_1/Kconfig
index 4a246fb..ae48885 100644
--- a/src/cpu/intel/slot_1/Kconfig
+++ b/src/cpu/intel/slot_1/Kconfig
@@ -15,7 +15,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select NO_SMM
 	select UDELAY_TSC
 	select TSC_MONOTONIC_TIMER
diff --git a/src/cpu/intel/socket_mPGA604/Kconfig b/src/cpu/intel/socket_mPGA604/Kconfig
index 5c830b8..02145d5 100644
--- a/src/cpu/intel/socket_mPGA604/Kconfig
+++ b/src/cpu/intel/socket_mPGA604/Kconfig
@@ -9,7 +9,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select MMX
 	select SSE
 	select UDELAY_TSC
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig
index e45c1e21..6ab327f 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -9,7 +9,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select SMP
 	select UDELAY_TSC
 	select TSC_MONOTONIC_TIMER
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 5dad9dd..8d1dfa6 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -53,6 +53,7 @@
 config UDELAY_TSC
 	bool
 	default n
+	select CPU_X86_TSC
 
 config UNKNOWN_TSC_RATE
 	bool
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index dcb9cae..e6ed611 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -16,7 +16,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select RESET_VECTOR_IN_RAM
 	select X86_AMD_FIXED_MTRRS
 	select X86_AMD_INIT_SIPI
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 2358677..1b2337f 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -32,7 +32,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select IOAPIC
 	select PCR_COMMON_IOSF_1_0
 	select SMP
diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index ed5cc90..1f7a804 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -17,7 +17,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select HAVE_SMI_HANDLER
diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig
index 1177292..c5ff0fa 100644
--- a/src/soc/intel/braswell/Kconfig
+++ b/src/soc/intel/braswell/Kconfig
@@ -17,7 +17,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
 	select HAVE_SMI_HANDLER
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 2473728..bd810ad 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -20,7 +20,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select HAVE_SMI_HANDLER
 	select SOUTHBRIDGE_INTEL_COMMON_RESET
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index 20482d0..9c7bad9 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -70,7 +70,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select FSP_COMPRESS_FSP_S_LZMA
 	select FSP_M_XIP
 	select GENERIC_GPIO_LIB
diff --git a/src/soc/intel/denverton_ns/Kconfig b/src/soc/intel/denverton_ns/Kconfig
index a9899be..18dba59 100644
--- a/src/soc/intel/denverton_ns/Kconfig
+++ b/src/soc/intel/denverton_ns/Kconfig
@@ -18,7 +18,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select DEBUG_GPIO
 	select SOC_INTEL_COMMON
 	select SOC_INTEL_COMMON_RESET
diff --git a/src/soc/intel/icelake/Kconfig b/src/soc/intel/icelake/Kconfig
index 00ac262..b6453cd 100644
--- a/src/soc/intel/icelake/Kconfig
+++ b/src/soc/intel/icelake/Kconfig
@@ -19,7 +19,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select FSP_M_XIP
 	select GENERIC_GPIO_LIB
 	select HAVE_FSP_GOP
diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig
index 1527192..a3a673d 100644
--- a/src/soc/intel/jasperlake/Kconfig
+++ b/src/soc/intel/jasperlake/Kconfig
@@ -20,7 +20,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select FSP_COMPRESS_FSP_S_LZ4
 	select FSP_M_XIP
 	select GENERIC_GPIO_LIB
diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig
index ada39da..fa6861e 100644
--- a/src/soc/intel/quark/Kconfig
+++ b/src/soc/intel/quark/Kconfig
@@ -14,7 +14,6 @@
 	select ARCH_ROMSTAGE_X86_32
 	select ARCH_VERSTAGE_X86_32
 	select CPU_X86_MTRR
-	select CPU_X86_TSC
 	select NO_MMCONF_SUPPORT
 	select REG_SCRIPT
 	select PLATFORM_USES_FSP2_0
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 834cbe0..a753db8 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -32,7 +32,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select FSP_M_XIP
 	select GENERIC_GPIO_LIB
 	select HAVE_FSP_GOP
diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig
index f902d8e..c3105c8 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -20,7 +20,6 @@
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
 	select CPU_X86_SMM
-	select CPU_X86_TSC
 	select FSP_COMPRESS_FSP_S_LZ4
 	select FSP_M_XIP
 	select GENERIC_GPIO_LIB
diff --git a/src/soc/intel/xeon_sp/Kconfig b/src/soc/intel/xeon_sp/Kconfig
index 4f420e2..7ab0ed0 100644
--- a/src/soc/intel/xeon_sp/Kconfig
+++ b/src/soc/intel/xeon_sp/Kconfig
@@ -33,7 +33,6 @@
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CPU_X86_LAPIC
 	select CPU_X86_MTRR
-	select CPU_X86_TSC
 	select POSTCAR_CONSOLE
 	select SOC_INTEL_COMMON
 	select SOC_INTEL_COMMON_RESET

To view, visit change 44311. To unsubscribe, or for help writing mail filters, visit settings.