Vlv2TbltDevicePkg: Retire 8254 timer and 8259 module

Use HpetTimerDxe instead of SmartTimer protocol. Retire 8259 as well.
Tested boot to Win10x64 successfully.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zailiang Sun <zailiang.sun@intel.com>
Cc: David Wei <david.wei@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Reviewed-by: Yi Qian <yi.qian@intel.com>
This commit is contained in:
Zailiang Sun 2019-04-17 15:21:19 +08:00 committed by zwei4
parent 2980988575
commit 07accfe398
6 changed files with 11 additions and 22 deletions

View File

@ -685,10 +685,6 @@ INF $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.inf
INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf
#
# Legacy Modules
#
INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
# #
# FAT file system # FAT file system

View File

@ -36,7 +36,7 @@ DEFINE CLKGEN_CONFIG_EXTRA_ENABLE=TRUE
# TRUE - HPET timer is used. # TRUE - HPET timer is used.
# FALSE - 8254 timer is used. # FALSE - 8254 timer is used.
# #
DEFINE USE_HPET_TIMER = FALSE DEFINE USE_HPET_TIMER = TRUE
# #

View File

@ -133,7 +133,7 @@ FILE = $(WORKSPACE)/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageFtwSpare.bin
$(FLASH_REGION_FSPBIN_OFFSET)|$(FLASH_REGION_FSPBIN_SIZE) $(FLASH_REGION_FSPBIN_OFFSET)|$(FLASH_REGION_FSPBIN_SIZE)
gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize
FILE = Vlv2MiscBinariesPkg/FspBinary/FvFsp.bin FILE = Vlv2SocBinPkg/FspBinary/FvFsp.bin
$(FLASH_REGION_AZALIABIN_OFFSET)|$(FLASH_REGION_AZALIABIN_SIZE) $(FLASH_REGION_AZALIABIN_OFFSET)|$(FLASH_REGION_AZALIABIN_SIZE)
@ -417,7 +417,11 @@ INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MpCpu.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MpCpu.inf
INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf
INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
!if $(ARCH) == IA32
INF USE=IA32 MdeModulePkg/Logo/Logo.inf
!else
INF USE=X64 MdeModulePkg/Logo/Logo.inf INF USE=X64 MdeModulePkg/Logo/Logo.inf
!endif
INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
@ -521,7 +525,7 @@ INF $(PLATFORM_PACKAGE)/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf
INF $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf INF $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf
FILE DRIVER = FF0C8745-3270-4439-B74F-3E45F8C77064 { FILE DRIVER = FF0C8745-3270-4439-B74F-3E45F8C77064 {
SECTION DXE_DEPEX_EXP = {gPlatformGOPPolicyGuid} SECTION DXE_DEPEX_EXP = {gPlatformGOPPolicyGuid}
SECTION PE32 = Vlv2MiscBinariesPkg/GOP/7.2.1011/RELEASE_VS2008x86/$(DXE_ARCHITECTURE)/IntelGopDriver.efi SECTION PE32 = Vlv2SocBinPkg/GOP/7.2.1011/RELEASE_VS2008x86/$(DXE_ARCHITECTURE)/IntelGopDriver.efi
SECTION UI = "IntelGopDriver" SECTION UI = "IntelGopDriver"
} }
!endif !endif
@ -636,10 +640,6 @@ INF $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.inf
INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf
#
# Legacy Modules
#
INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
# #
# FAT file system # FAT file system
@ -660,7 +660,7 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
!if $(GOP_DRIVER_ENABLE) == TRUE !if $(GOP_DRIVER_ENABLE) == TRUE
FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA { FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
SECTION RAW = Vlv2MiscBinariesPkg/GOP/7.2.1011/VBT/MNW2/Vbt.bin SECTION RAW = Vlv2SocBinPkg/GOP/7.2.1011/VBT/MNW2/Vbt.bin
SECTION UI = "IntelGopVbt" SECTION UI = "IntelGopVbt"
} }
!endif !endif
@ -670,7 +670,7 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
# #
!if $(NETWORK_ENABLE) == TRUE !if $(NETWORK_ENABLE) == TRUE
FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C { FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
SECTION PE32 = Vlv2MiscBinariesPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi SECTION PE32 = Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
SECTION UI = "UNDI" SECTION UI = "UNDI"
} }
INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

View File

@ -26,7 +26,7 @@
# #
DEFINE PLATFORM_PACKAGE = Vlv2TbltDevicePkg DEFINE PLATFORM_PACKAGE = Vlv2TbltDevicePkg
DEFINE PLATFORM_RC_PACKAGE = Vlv2DeviceRefCodePkg DEFINE PLATFORM_RC_PACKAGE = Vlv2DeviceRefCodePkg
DEFINE PLATFORM_BINARY_PACKAGE = Vlv2BinaryPkg DEFINE PLATFORM_BINARY_PACKAGE = Vlv2SocBinPkg
OUTPUT_DIRECTORY = Build/$(PLATFORM_PACKAGE) OUTPUT_DIRECTORY = Build/$(PLATFORM_PACKAGE)
SUPPORTED_ARCHITECTURES = IA32|X64 SUPPORTED_ARCHITECTURES = IA32|X64
BUILD_TARGETS = DEBUG|RELEASE BUILD_TARGETS = DEBUG|RELEASE
@ -1424,15 +1424,12 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
# #
# CPU/FW Microde # CPU/FW Microde
# #
Vlv2MiscBinariesPkg/Microcode/MicrocodeUpdates.inf { Vlv2SocBinPkg/Microcode/MicrocodeUpdates.inf {
<BuildOptions> <BuildOptions>
*_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF *_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF
} }
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
!if $(NETWORK_ENABLE) == TRUE !if $(NETWORK_ENABLE) == TRUE
!if $(NETWORK_ISCSI_ENABLE) == TRUE !if $(NETWORK_ISCSI_ENABLE) == TRUE
NetworkPkg/IScsiDxe/IScsiDxe.inf NetworkPkg/IScsiDxe/IScsiDxe.inf

View File

@ -1420,8 +1420,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
} }
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
!if $(NETWORK_ENABLE) == TRUE !if $(NETWORK_ENABLE) == TRUE
!if $(NETWORK_ISCSI_ENABLE) == TRUE !if $(NETWORK_ISCSI_ENABLE) == TRUE

View File

@ -1432,8 +1432,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
} }
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
!if $(NETWORK_ENABLE) == TRUE !if $(NETWORK_ENABLE) == TRUE
!if $(NETWORK_ISCSI_ENABLE) == TRUE !if $(NETWORK_ISCSI_ENABLE) == TRUE