Change in coreboot[master]: arch/x86: Flip HAVE_MONOTONIC_TIMER default

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34113 )

Change subject: arch/x86: Flip HAVE_MONOTONIC_TIMER default
......................................................................

arch/x86: Flip HAVE_MONOTONIC_TIMER default

Change-Id: Id56139a3d0840684b13179821a77bc8ae28e05ae
Signed-off-by: Kyösti Mälkki 
---
M src/Kconfig
M src/cpu/amd/family_10h-family_15h/Kconfig
M src/cpu/intel/haswell/Kconfig
M src/cpu/intel/slot_1/Kconfig
M src/cpu/x86/Kconfig
M src/soc/amd/stoneyridge/Kconfig
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/braswell/Kconfig
M src/soc/intel/broadwell/Kconfig
M src/soc/intel/cannonlake/Kconfig
M src/soc/intel/icelake/Kconfig
M src/soc/intel/quark/Kconfig
M src/soc/intel/skylake/Kconfig
13 files changed, 2 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/34113/1

diff --git a/src/Kconfig b/src/Kconfig
index eea5d82..5fb8dee 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -507,7 +507,7 @@
 config HAVE_MONOTONIC_TIMER
    bool
    default n if NO_MONOTONIC_TIMER
-	default y if !ARCH_X86
+	default y
    help
     The board/chipset provides a monotonic timer.

diff --git a/src/cpu/amd/family_10h-family_15h/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig
index 8ff685f..df65499 100644
--- a/src/cpu/amd/family_10h-family_15h/Kconfig
+++ b/src/cpu/amd/family_10h-family_15h/Kconfig
@@ -7,7 +7,6 @@
    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 5936953..160ce0f 100644
--- a/src/cpu/intel/haswell/Kconfig
+++ b/src/cpu/intel/haswell/Kconfig
@@ -10,7 +10,6 @@
    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 ab66632..8e3df12 100644
--- a/src/cpu/intel/slot_1/Kconfig
+++ b/src/cpu/intel/slot_1/Kconfig
@@ -25,6 +25,7 @@
    select CPU_INTEL_MODEL_68X
    select CPU_INTEL_MODEL_6BX
    select CPU_INTEL_MODEL_6XX
+	select NO_MONOTONIC_TIMER

config DCACHE_RAM_BASE
    hex
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 99a7075..ca65839 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -24,7 +24,6 @@
 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_MONOTONIC_TIMER
    def_bool n
    depends on UDELAY_TSC
-	select HAVE_MONOTONIC_TIMER
    help
      Expose monotonic time using the TSC.

diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index ba82565..ef43338 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -39,7 +39,6 @@
    select GENERIC_UDELAY
    select IOAPIC
    select HAVE_USBDEBUG_OPTIONS
-	select HAVE_MONOTONIC_TIMER
    select SPI_FLASH if HAVE_ACPI_RESUME
    select TSC_SYNC_LFENCE
    select COLLECT_TIMESTAMPS
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 1f819ea..44c4881 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -102,7 +102,6 @@
    select UDELAY_TSC
    select TSC_CONSTANT_RATE
    select TSC_MONOTONIC_TIMER
-	select HAVE_MONOTONIC_TIMER
    select PLATFORM_USES_FSP2_0
    select UDK_2015_BINDING if !SOC_INTEL_GLK
    select UDK_2017_BINDING if SOC_INTEL_GLK
diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig
index 920179f83..e58334e 100644
--- a/src/soc/intel/braswell/Kconfig
+++ b/src/soc/intel/braswell/Kconfig
@@ -19,7 +19,6 @@
    select SUPPORT_CPU_UCODE_IN_CBFS
    select MICROCODE_BLOB_NOT_IN_BLOB_REPO
    select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
-	select HAVE_MONOTONIC_TIMER
    select HAVE_SMI_HANDLER
    select NO_FIXED_XIP_ROM_SIZE
    select PARALLEL_MP
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 801800c..e64d296 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -18,7 +18,6 @@
    select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
    select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
    select SUPPORT_CPU_UCODE_IN_CBFS
-	select HAVE_MONOTONIC_TIMER
    select HAVE_SMI_HANDLER
    select SOUTHBRIDGE_INTEL_COMMON_RESET
    select HAVE_USBDEBUG
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index 5e405db..d490312 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -66,7 +66,6 @@
    select GENERIC_GPIO_LIB
    select HAVE_FSP_GOP
    select INTEL_DESCRIPTOR_MODE_CAPABLE
-	select HAVE_MONOTONIC_TIMER
    select HAVE_SMI_HANDLER
    select IDT_IN_EVERY_STAGE
    select INTEL_GMA_ACPI
diff --git a/src/soc/intel/icelake/Kconfig b/src/soc/intel/icelake/Kconfig
index f0b2918..2a16694 100644
--- a/src/soc/intel/icelake/Kconfig
+++ b/src/soc/intel/icelake/Kconfig
@@ -23,7 +23,6 @@
    select GENERIC_GPIO_LIB
    select HAVE_FSP_GOP
    select INTEL_DESCRIPTOR_MODE_CAPABLE
-	select HAVE_MONOTONIC_TIMER
    select HAVE_SMI_HANDLER
    select IDT_IN_EVERY_STAGE
    select INTEL_GMA_ACPI
diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig
index 2a0c132..4aa641c 100644
--- a/src/soc/intel/quark/Kconfig
+++ b/src/soc/intel/quark/Kconfig
@@ -27,7 +27,6 @@
    select ARCH_ROMSTAGE_X86_32
    select ARCH_VERSTAGE_X86_32
    select C_ENVIRONMENT_BOOTBLOCK
-	select HAVE_MONOTONIC_TIMER
    select NO_MMCONF_SUPPORT
    select REG_SCRIPT
    select SOC_INTEL_COMMON
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index fb455d2..3c4ba38 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -38,7 +38,6 @@
    select GENERIC_GPIO_LIB
    select HAVE_FSP_GOP
    select INTEL_DESCRIPTOR_MODE_CAPABLE
-	select HAVE_MONOTONIC_TIMER
    select HAVE_SMI_HANDLER
    select INTEL_CAR_NEM_ENHANCED
    select INTEL_GMA_ACPI

[Kyösti Mälkki (Code Review)]

Hello Patrick Rudolph, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/34113

to look at the new patch set (#2).

Change subject: arch/x86: Flip HAVE_MONOTONIC_TIMER default
......................................................................

arch/x86: Flip HAVE_MONOTONIC_TIMER default

Change-Id: Id56139a3d0840684b13179821a77bc8ae28e05ae
Signed-off-by: Kyösti Mälkki 
---
M src/Kconfig
M src/cpu/amd/family_10h-family_15h/Kconfig
M src/cpu/intel/haswell/Kconfig
M src/cpu/intel/slot_1/Kconfig
M src/cpu/qemu-x86/Kconfig
M src/cpu/via/nano/Kconfig
M src/cpu/x86/Kconfig
M src/soc/amd/stoneyridge/Kconfig
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/braswell/Kconfig
M src/soc/intel/broadwell/Kconfig
M src/soc/intel/cannonlake/Kconfig
M src/soc/intel/icelake/Kconfig
M src/soc/intel/quark/Kconfig
M src/soc/intel/skylake/Kconfig
15 files changed, 4 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/34113/2

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34113 )

Change subject: arch/x86: Flip HAVE_MONOTONIC_TIMER default
......................................................................

Patch Set 3:

One more in `amd/picasso`?

[Kyösti Mälkki (Code Review)]

Hello Aaron Durbin, Patrick Rudolph, build bot (Jenkins), Nico Huber, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/34113

to look at the new patch set (#4).

Change subject: arch/x86: Flip HAVE_MONOTONIC_TIMER default
......................................................................

arch/x86: Flip HAVE_MONOTONIC_TIMER default

Change-Id: Id56139a3d0840684b13179821a77bc8ae28e05ae
Signed-off-by: Kyösti Mälkki 
---
M src/Kconfig
M src/cpu/amd/family_10h-family_15h/Kconfig
M src/cpu/intel/haswell/Kconfig
M src/cpu/intel/slot_1/Kconfig
M src/cpu/qemu-x86/Kconfig
M src/cpu/via/nano/Kconfig
M src/cpu/x86/Kconfig
M src/soc/amd/picasso/Kconfig
M src/soc/amd/stoneyridge/Kconfig
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/braswell/Kconfig
M src/soc/intel/broadwell/Kconfig
M src/soc/intel/cannonlake/Kconfig
M src/soc/intel/icelake/Kconfig
M src/soc/intel/quark/Kconfig
M src/soc/intel/skylake/Kconfig
16 files changed, 4 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/34113/4

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34113 )

Change subject: arch/x86: Flip HAVE_MONOTONIC_TIMER default
......................................................................

Patch Set 4: Code-Review+2

[Kyösti Mälkki (Code Review)]

Hello Aaron Durbin, Patrick Rudolph, build bot (Jenkins), Nico Huber, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/34113

to look at the new patch set (#5).

Change subject: arch/x86: Flip HAVE_MONOTONIC_TIMER default
......................................................................

arch/x86: Flip HAVE_MONOTONIC_TIMER default

Change-Id: Id56139a3d0840684b13179821a77bc8ae28e05ae
Signed-off-by: Kyösti Mälkki 
---
M src/Kconfig
M src/cpu/amd/family_10h-family_15h/Kconfig
M src/cpu/intel/haswell/Kconfig
M src/cpu/intel/slot_1/Kconfig
M src/cpu/qemu-x86/Kconfig
M src/cpu/via/nano/Kconfig
M src/cpu/x86/Kconfig
M src/soc/amd/picasso/Kconfig
M src/soc/amd/stoneyridge/Kconfig
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/braswell/Kconfig
M src/soc/intel/broadwell/Kconfig
M src/soc/intel/cannonlake/Kconfig
M src/soc/intel/icelake/Kconfig
M src/soc/intel/quark/Kconfig
M src/soc/intel/skylake/Kconfig
16 files changed, 4 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/34113/5

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34113 )

Change subject: arch/x86: Flip HAVE_MONOTONIC_TIMER default
......................................................................

Patch Set 5: Code-Review+2

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34113 )

Change subject: arch/x86: Flip HAVE_MONOTONIC_TIMER default
......................................................................

arch/x86: Flip HAVE_MONOTONIC_TIMER default

Change-Id: Id56139a3d0840684b13179821a77bc8ae28e05ae
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34113
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
---
M src/Kconfig
M src/cpu/amd/family_10h-family_15h/Kconfig
M src/cpu/intel/haswell/Kconfig
M src/cpu/intel/slot_1/Kconfig
M src/cpu/qemu-x86/Kconfig
M src/cpu/via/nano/Kconfig
M src/cpu/x86/Kconfig
M src/soc/amd/picasso/Kconfig
M src/soc/amd/stoneyridge/Kconfig
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/braswell/Kconfig
M src/soc/intel/broadwell/Kconfig
M src/soc/intel/cannonlake/Kconfig
M src/soc/intel/icelake/Kconfig
M src/soc/intel/quark/Kconfig
M src/soc/intel/skylake/Kconfig
16 files changed, 4 insertions(+), 14 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved

diff --git a/src/Kconfig b/src/Kconfig
index f79a390..b64fdca 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -507,7 +507,7 @@
 config HAVE_MONOTONIC_TIMER
    bool
    depends on !NO_MONOTONIC_TIMER
-	default y if !ARCH_X86
+	default y
    help
     The board/chipset provides a monotonic timer.

diff --git a/src/cpu/amd/family_10h-family_15h/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig
index 8ff685f..df65499 100644
--- a/src/cpu/amd/family_10h-family_15h/Kconfig
+++ b/src/cpu/amd/family_10h-family_15h/Kconfig
@@ -7,7 +7,6 @@
    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 9cc040e..cb8bc77 100644
--- a/src/cpu/intel/haswell/Kconfig
+++ b/src/cpu/intel/haswell/Kconfig
@@ -10,7 +10,6 @@
    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 890e33b..adfc2da 100644
--- a/src/cpu/intel/slot_1/Kconfig
+++ b/src/cpu/intel/slot_1/Kconfig
@@ -26,6 +26,7 @@
    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 0473e2f..141749e 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -21,5 +21,6 @@
    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 c7e7060..de1c215 100644
--- a/src/cpu/via/nano/Kconfig
+++ b/src/cpu/via/nano/Kconfig
@@ -26,6 +26,7 @@
    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 8cc493e..caee5db 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -24,7 +24,6 @@
 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_MONOTONIC_TIMER
    def_bool n
    depends on UDELAY_TSC
-	select HAVE_MONOTONIC_TIMER
    help
      Expose monotonic time using the TSC.

diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 048193e..d654e94 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -34,7 +34,6 @@
    select GENERIC_UDELAY
    select IOAPIC
    select HAVE_USBDEBUG_OPTIONS
-	select HAVE_MONOTONIC_TIMER
    select SPI_FLASH if HAVE_ACPI_RESUME
    select TSC_SYNC_LFENCE
    select COLLECT_TIMESTAMPS
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index f730cb2..78b89e3 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -39,7 +39,6 @@
    select GENERIC_UDELAY
    select IOAPIC
    select HAVE_USBDEBUG_OPTIONS
-	select HAVE_MONOTONIC_TIMER
    select SPI_FLASH if HAVE_ACPI_RESUME
    select TSC_SYNC_LFENCE
    select COLLECT_TIMESTAMPS
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 4cddb58..cf3d244 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -101,7 +101,6 @@
    select UDELAY_TSC
    select TSC_CONSTANT_RATE
    select TSC_MONOTONIC_TIMER
-	select HAVE_MONOTONIC_TIMER
    select PLATFORM_USES_FSP2_0
    select UDK_2015_BINDING if !SOC_INTEL_GLK
    select UDK_2017_BINDING if SOC_INTEL_GLK
diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig
index 61bedb4..7887156 100644
--- a/src/soc/intel/braswell/Kconfig
+++ b/src/soc/intel/braswell/Kconfig
@@ -19,7 +19,6 @@
    select SUPPORT_CPU_UCODE_IN_CBFS
    select MICROCODE_BLOB_NOT_IN_BLOB_REPO
    select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
-	select HAVE_MONOTONIC_TIMER
    select HAVE_SMI_HANDLER
    select NO_FIXED_XIP_ROM_SIZE
    select PARALLEL_MP
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 3f7aef5..bf6b78c 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -18,7 +18,6 @@
    select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
    select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
    select SUPPORT_CPU_UCODE_IN_CBFS
-	select HAVE_MONOTONIC_TIMER
    select HAVE_SMI_HANDLER
    select SOUTHBRIDGE_INTEL_COMMON_RESET
    select HAVE_USBDEBUG
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index 48e5f6b..fed7f02 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -66,7 +66,6 @@
    select GENERIC_GPIO_LIB
    select HAVE_FSP_GOP
    select INTEL_DESCRIPTOR_MODE_CAPABLE
-	select HAVE_MONOTONIC_TIMER
    select HAVE_SMI_HANDLER
    select IDT_IN_EVERY_STAGE
    select INTEL_GMA_ACPI
diff --git a/src/soc/intel/icelake/Kconfig b/src/soc/intel/icelake/Kconfig
index db0f110..a2261a0 100644
--- a/src/soc/intel/icelake/Kconfig
+++ b/src/soc/intel/icelake/Kconfig
@@ -23,7 +23,6 @@
    select GENERIC_GPIO_LIB
    select HAVE_FSP_GOP
    select INTEL_DESCRIPTOR_MODE_CAPABLE
-	select HAVE_MONOTONIC_TIMER
    select HAVE_SMI_HANDLER
    select IDT_IN_EVERY_STAGE
    select INTEL_GMA_ACPI
diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig
index 2a0c132..4aa641c 100644
--- a/src/soc/intel/quark/Kconfig
+++ b/src/soc/intel/quark/Kconfig
@@ -27,7 +27,6 @@
    select ARCH_ROMSTAGE_X86_32
    select ARCH_VERSTAGE_X86_32
    select C_ENVIRONMENT_BOOTBLOCK
-	select HAVE_MONOTONIC_TIMER
    select NO_MMCONF_SUPPORT
    select REG_SCRIPT
    select SOC_INTEL_COMMON
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index ca690f4..f36d5ca 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -38,7 +38,6 @@
    select GENERIC_GPIO_LIB
    select HAVE_FSP_GOP
    select INTEL_DESCRIPTOR_MODE_CAPABLE
-	select HAVE_MONOTONIC_TIMER
    select HAVE_SMI_HANDLER
    select INTEL_CAR_NEM_ENHANCED
    select INTEL_GMA_ACPI