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>

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index fc09618ef4dc67fa7a1a2e947e7971a1d81042ea..1bdf0e3f44e54333f43e5241f37fe4086cae899f 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -685,10 +685,6 @@ INF $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.inf
 \r
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf\r
 \r
-  #\r
-  # Legacy Modules\r
-  #\r
-INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
 \r
 #\r
 # FAT file system\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
index c8e9dd3a53e946e650130ce899fd394b99162378..6d556c1be249b4399ad9b8d15976a16058f04b19 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
@@ -36,7 +36,7 @@ DEFINE CLKGEN_CONFIG_EXTRA_ENABLE=TRUE
 # TRUE  - HPET timer is used.\r
 # FALSE - 8254 timer is used.\r
 #\r
-DEFINE USE_HPET_TIMER = FALSE\r
+DEFINE USE_HPET_TIMER = TRUE\r
 \r
 \r
 #\r

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

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

diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 5735bcb9a9fcf1f3e47a4a5f0962eedf9ecfe02b..28e6f5a181010a689c79a526ee36e6123b46ba64 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1420,8 +1420,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   }\r
 \r
 \r
-  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
-\r
 \r
 !if $(NETWORK_ENABLE) == TRUE\r
   !if $(NETWORK_ISCSI_ENABLE) == TRUE\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 45675e1d578db9ea7bc8109295705095b94ae1b2..f9ba56ef4bc01caa9548b62edb104426e0ea1fa7 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1432,8 +1432,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   }\r
 \r
 \r
-  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
-\r
 \r
 !if $(NETWORK_ENABLE) == TRUE\r
   !if $(NETWORK_ISCSI_ENABLE) == TRUE\r