From b5e1984594525878172fb17abf3939e71963a5ff Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 29 Apr 2015 20:44:06 +0200 Subject: intel/broadwell: Don't select MONOTONIC_TIMER_MSR That's a Haswell exclusive, used nowhere else, but confusing when hunting for the monotonic timer used on that SoC. Change-Id: I60ec523e54e5af0d2a418bcb9145de452a3a4ea9 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/10034 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Aaron Durbin --- src/mainboard/google/samus/Kconfig | 1 - src/mainboard/intel/wtm2/Kconfig | 1 - src/soc/intel/broadwell/Kconfig | 6 ------ 3 files changed, 8 deletions(-) diff --git a/src/mainboard/google/samus/Kconfig b/src/mainboard/google/samus/Kconfig index 664faf1b98..f655b2969b 100644 --- a/src/mainboard/google/samus/Kconfig +++ b/src/mainboard/google/samus/Kconfig @@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select EXTERNAL_MRC_BLOB - select MONOTONIC_TIMER_MSR select CHROMEOS_RAMOOPS_DYNAMIC select INTEL_INT15 select CHROMEOS_VBNV_CMOS diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig index 98b2790393..5a064d1237 100644 --- a/src/mainboard/intel/wtm2/Kconfig +++ b/src/mainboard/intel/wtm2/Kconfig @@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_NATIVE_VGA_INIT - select MONOTONIC_TIMER_MSR select INTEL_INT15 select CHROMEOS_RAMOOPS_DYNAMIC diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index 91249ee007..695e495124 100644 --- a/src/soc/intel/broadwell/Kconfig +++ b/src/soc/intel/broadwell/Kconfig @@ -174,12 +174,6 @@ config RESET_ON_INVALID_RAMSTAGE_CACHE when the ramstage cache is invalid. If selected the system will reset otherwise the ramstage will be reloaded from cbfs. -config MONOTONIC_TIMER_MSR - def_bool y - select HAVE_MONOTONIC_TIMER - help - Provide a monotonic timer using the 24MHz MSR counter. - config INTEL_PCH_UART_CONSOLE bool "Use Serial IO UART for console" default n -- cgit v1.2.3