intel/haswell: Drop MONOTONIC_TIMER_MSR

The variable was set on all haswell boards, so we can do it like on
broadwell where the MSR based timer is assumed to be around, too.

Change-Id: Id48ad7454d4cf83c3b1616b64687cdcfee4baa10
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10256
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)

src/cpu/intel/haswell/Kconfig

@@ -11,6 +11,7 @@ config CPU_SPECIFIC_OPTIONS
 	select ARCH_ROMSTAGE_X86_32
 	select ARCH_RAMSTAGE_X86_32
 	select BACKUP_DEFAULT_SMM_REGION
+	select HAVE_MONOTONIC_TIMER
 	select SMP
 	select MMX
 	select SSE
@@ -60,11 +61,4 @@ config RESET_ON_INVALID_RAMSTAGE_CACHE
 	  the system will reset otherwise the ramstage will be reloaded from
 	  cbfs.
 
-config MONOTONIC_TIMER_MSR
-	def_bool n
-	depends on INTEL_LYNXPOINT_LP
-	select HAVE_MONOTONIC_TIMER
-	help
-	  Provide a monotonic timer using the 24MHz MSR counter.
-
 endif

src/cpu/intel/haswell/Makefile.inc

@@ -6,7 +6,7 @@ romstage-y += tsc_freq.c
 ramstage-y += acpi.c
 ramstage-$(CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM) += stage_cache.c
 ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.c
-ramstage-$(CONFIG_MONOTONIC_TIMER_MSR) += monotonic_timer.c
+ramstage-y += monotonic_timer.c
 
 romstage-$(CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM) += stage_cache.c
 
@@ -14,7 +14,7 @@ cpu_microcode-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE)  += microcode_blob.c
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c
 smm-$(CONFIG_HAVE_SMI_HANDLER) += tsc_freq.c
-smm-$(CONFIG_MONOTONIC_TIMER_MSR) += monotonic_timer.c
+smm-y += monotonic_timer.c
 
 cpu_incs += $(src)/cpu/intel/haswell/cache_as_ram.inc
 

src/mainboard/google/bolt/Kconfig

@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_SMI_HANDLER
 	select MAINBOARD_HAS_CHROMEOS
 	select EXTERNAL_MRC_BLOB
-	select MONOTONIC_TIMER_MSR
 	select INTEL_INT15
 	select CHROMEOS_VBNV_CMOS
 

src/mainboard/google/falco/Kconfig

@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_SMI_HANDLER
 	select MAINBOARD_HAS_CHROMEOS
 	select EXTERNAL_MRC_BLOB
-	select MONOTONIC_TIMER_MSR
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_DO_NATIVE_VGA_INIT
 	select INTEL_INT15

src/mainboard/google/panther/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 INTEL_INT15
 	select PHYSICAL_REC_SWITCH
 	select CHROMEOS_VBNV_CMOS

src/mainboard/google/peppy/Kconfig

@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_SMI_HANDLER
 	select MAINBOARD_HAS_CHROMEOS
 	select EXTERNAL_MRC_BLOB
-	select MONOTONIC_TIMER_MSR
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_DO_NATIVE_VGA_INIT
 	select INTEL_DP

src/mainboard/google/slippy/Kconfig

@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_SMI_HANDLER
 	select MAINBOARD_HAS_CHROMEOS
 	select EXTERNAL_MRC_BLOB
-	select MONOTONIC_TIMER_MSR
 	select INTEL_DP
 	select INTEL_DDI
 	select INTEL_INT15

src/mainboard/intel/baskingridge/Kconfig

@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_RESUME
 	select HAVE_SMI_HANDLER
 	select MAINBOARD_HAS_CHROMEOS
-	select MONOTONIC_TIMER_MSR
 	select INTEL_INT15
 	select CHROMEOS_VBNV_CMOS