summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-01 15:38:25 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-09 13:36:18 +0000
commitb28b6b53cc51fef83eb290e746c91afcddc6eb49 (patch)
tree631fa0609048eff9bd042ec025cc85b7628ed64a /src/cpu
parent76c43866990bf61c35b1fb6f6915614eebc8d4a4 (diff)
downloadcoreboot-b28b6b53cc51fef83eb290e746c91afcddc6eb49.tar.xz
arch/x86: Flip HAVE_MONOTONIC_TIMER default
Change-Id: Id56139a3d0840684b13179821a77bc8ae28e05ae Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34113 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/amd/family_10h-family_15h/Kconfig1
-rw-r--r--src/cpu/intel/haswell/Kconfig1
-rw-r--r--src/cpu/intel/slot_1/Kconfig1
-rw-r--r--src/cpu/qemu-x86/Kconfig1
-rw-r--r--src/cpu/via/nano/Kconfig1
-rw-r--r--src/cpu/x86/Kconfig2
6 files changed, 3 insertions, 4 deletions
diff --git a/src/cpu/amd/family_10h-family_15h/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig
index 8ff685f0c1..df6549987e 100644
--- a/src/cpu/amd/family_10h-family_15h/Kconfig
+++ b/src/cpu/amd/family_10h-family_15h/Kconfig
@@ -7,7 +7,6 @@ config CPU_AMD_MODEL_10XXX
select SSE2
select TSC_SYNC_LFENCE
select UDELAY_LAPIC
- select HAVE_MONOTONIC_TIMER
select SUPPORT_CPU_UCODE_IN_CBFS
select CPU_MICROCODE_MULTIPLE_FILES
select ACPI_HUGE_LOWMEM_BACKUP
diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig
index 9cc040ec62..cb8bc77335 100644
--- a/src/cpu/intel/haswell/Kconfig
+++ b/src/cpu/intel/haswell/Kconfig
@@ -10,7 +10,6 @@ config CPU_SPECIFIC_OPTIONS
select ARCH_VERSTAGE_X86_32
select ARCH_ROMSTAGE_X86_32
select ARCH_RAMSTAGE_X86_32
- select HAVE_MONOTONIC_TIMER
select SMP
select MMX
select SSE2
diff --git a/src/cpu/intel/slot_1/Kconfig b/src/cpu/intel/slot_1/Kconfig
index 890e33bbf8..adfc2da75a 100644
--- a/src/cpu/intel/slot_1/Kconfig
+++ b/src/cpu/intel/slot_1/Kconfig
@@ -26,6 +26,7 @@ config SLOT_SPECIFIC_OPTIONS # dummy
select CPU_INTEL_MODEL_6BX
select CPU_INTEL_MODEL_6XX
select NO_SMM
+ select NO_MONOTONIC_TIMER
config DCACHE_RAM_BASE
hex
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig
index 0473e2f7f0..141749eca4 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -21,5 +21,6 @@ config CPU_QEMU_X86
select ARCH_RAMSTAGE_X86_32
select SMP
select UDELAY_TSC
+ select NO_MONOTONIC_TIMER
select C_ENVIRONMENT_BOOTBLOCK
select SMM_ASEG
diff --git a/src/cpu/via/nano/Kconfig b/src/cpu/via/nano/Kconfig
index c7e7060957..de1c2155e5 100644
--- a/src/cpu/via/nano/Kconfig
+++ b/src/cpu/via/nano/Kconfig
@@ -26,6 +26,7 @@ config CPU_SPECIFIC_OPTIONS
select ARCH_ROMSTAGE_X86_32
select ARCH_RAMSTAGE_X86_32
select UDELAY_TSC
+ select NO_MONOTONIC_TIMER
select MMX
select SSE2
select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 8cc493ed55..caee5dbd10 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -24,7 +24,6 @@ config UDELAY_LAPIC
config LAPIC_MONOTONIC_TIMER
def_bool n
depends on UDELAY_LAPIC
- select HAVE_MONOTONIC_TIMER
help
Expose monotonic time using the local APIC.
@@ -45,7 +44,6 @@ config TSC_CONSTANT_RATE
config TSC_MONOTONIC_TIMER
def_bool n
depends on UDELAY_TSC
- select HAVE_MONOTONIC_TIMER
help
Expose monotonic time using the TSC.