From cf9ea55473cde8b9a2b9494eca452df7783376e5 Mon Sep 17 00:00:00 2001 From: Lijian Zhao Date: Fri, 7 Sep 2018 17:58:08 -0700 Subject: payloads/tianocore: Add option to use 8254 timer Change TianoCore payload default to use HPET timer. Add an option to use 8254 timer for legacy platform support. BUG=N/A. TEST=Build and boot up into UEFI shell on Whiskey Lake rvp platform. Change-Id: I857704b0ca128fc9da193ae26a33c7cf89ad7320 Signed-off-by: Lijian Zhao Reviewed-on: https://review.coreboot.org/28542 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-by: Duncan Laurie Reviewed-by: Pratikkumar V Prajapati --- payloads/external/tianocore/Kconfig | 5 +++++ payloads/external/tianocore/Makefile | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'payloads/external/tianocore') diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig index 596b19191f..a30fc31a45 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -88,4 +88,9 @@ config TIANOCORE_RELEASE endchoice +config TIANOCORE_USE_8254_TIMER + bool "TianoCore 8254 Timer" + help + Use 8254 Timer for legacy support. + endif diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 2f770d21bb..c280fe1b6d 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -33,10 +33,14 @@ else BUILD_TYPE=RELEASE endif +ifneq ($(CONFIG_TIANOCORE_USE_8254_TIMER), y) +TIMER=-DUSE_HPET_TIMER +endif + ifeq ($(CONFIG_TIANOCORE_TARGET_IA32), y) - BUILD_STR=-a IA32 -t COREBOOT -p CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc -b $(BUILD_TYPE) + BUILD_STR=-a IA32 -t COREBOOT -p CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc -b $(BUILD_TYPE) $(TIMER) else - BUILD_STR=-a IA32 -a X64 -t COREBOOT -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc -b $(BUILD_TYPE) + BUILD_STR=-a IA32 -a X64 -t COREBOOT -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc -b $(BUILD_TYPE) $(TIMER) endif all: build -- cgit v1.2.3