public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH] Vlv2TbltDevicePkg: Retire 8254 timer and 8259 module
@ 2019-04-17  7:24 Sun, Zailiang
  2019-04-17  8:09 ` Qian, Yi
  0 siblings, 1 reply; 3+ messages in thread
From: Sun, Zailiang @ 2019-04-17  7:24 UTC (permalink / raw)
  To: devel; +Cc: David Wei, Yi Qian

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>
---
 Vlv2TbltDevicePkg/PlatformPkg.fdf       |  4 ----
 Vlv2TbltDevicePkg/PlatformPkgConfig.dsc |  2 +-
 Vlv2TbltDevicePkg/PlatformPkgGcc.fdf    | 16 ++++++++--------
 Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc |  7 ++-----
 Vlv2TbltDevicePkg/PlatformPkgIA32.dsc   |  2 --
 Vlv2TbltDevicePkg/PlatformPkgX64.dsc    |  2 --
 6 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index fc09618ef4..1bdf0e3f44 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -685,10 +685,6 @@ INF $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.inf
 
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf
 
-  #
-  # Legacy Modules
-  #
-INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
 
 #
 # FAT file system
diff --git a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
index c8e9dd3a53..6d556c1be2 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
@@ -36,7 +36,7 @@ DEFINE CLKGEN_CONFIG_EXTRA_ENABLE=TRUE
 # TRUE  - HPET timer is used.
 # FALSE - 8254 timer is used.
 #
-DEFINE USE_HPET_TIMER = FALSE
+DEFINE USE_HPET_TIMER = TRUE
 
 
 #
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 25141eb44b..102ba46c5b 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -133,7 +133,7 @@ FILE = $(WORKSPACE)/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageFtwSpare.bin
 
   $(FLASH_REGION_FSPBIN_OFFSET)|$(FLASH_REGION_FSPBIN_SIZE)
   gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize
-  FILE = Vlv2MiscBinariesPkg/FspBinary/FvFsp.bin
+  FILE = Vlv2SocBinPkg/FspBinary/FvFsp.bin
 
 
   $(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 $(PLATFORM_PACKAGE)/Metronome/Metronome.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
+!endif
 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
 INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
 INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
@@ -521,7 +525,7 @@ INF $(PLATFORM_PACKAGE)/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf
  INF $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf
  FILE DRIVER = FF0C8745-3270-4439-B74F-3E45F8C77064 {
   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"
 }
 !endif
@@ -636,10 +640,6 @@ INF $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.inf
 
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf
 
-  #
-  # Legacy Modules
-  #
-INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
 
 #
 # FAT file system
@@ -660,7 +660,7 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
 
 !if $(GOP_DRIVER_ENABLE) == TRUE
 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"
 }
 !endif
@@ -670,7 +670,7 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
 #
 !if $(NETWORK_ENABLE) == TRUE
   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"
   }
   INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index cd5aff4669..b3642c5c7a 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -26,7 +26,7 @@
   #
   DEFINE      PLATFORM_PACKAGE                = Vlv2TbltDevicePkg
   DEFINE      PLATFORM_RC_PACKAGE             = Vlv2DeviceRefCodePkg
-  DEFINE      PLATFORM_BINARY_PACKAGE         = Vlv2BinaryPkg
+  DEFINE      PLATFORM_BINARY_PACKAGE         = Vlv2SocBinPkg
   OUTPUT_DIRECTORY                    = Build/$(PLATFORM_PACKAGE)
   SUPPORTED_ARCHITECTURES             = IA32|X64
   BUILD_TARGETS                       = DEBUG|RELEASE
@@ -1424,15 +1424,12 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   #
   # CPU/FW Microde
   #
-  Vlv2MiscBinariesPkg/Microcode/MicrocodeUpdates.inf {
+  Vlv2SocBinPkg/Microcode/MicrocodeUpdates.inf {
     <BuildOptions>
       *_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF
   }
 
 
-  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
-
-
 !if $(NETWORK_ENABLE) == TRUE
   !if $(NETWORK_ISCSI_ENABLE) == TRUE
     NetworkPkg/IScsiDxe/IScsiDxe.inf
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 5735bcb9a9..28e6f5a181 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1420,8 +1420,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   }
 
 
-  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
-
 
 !if $(NETWORK_ENABLE) == TRUE
   !if $(NETWORK_ISCSI_ENABLE) == TRUE
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 45675e1d57..f9ba56ef4b 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1432,8 +1432,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   }
 
 
-  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
-
 
 !if $(NETWORK_ENABLE) == TRUE
   !if $(NETWORK_ISCSI_ENABLE) == TRUE
-- 
2.19.1.windows.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH] Vlv2TbltDevicePkg: Retire 8254 timer and 8259 module
@ 2019-04-18  4:52 Sun, Zailiang
  0 siblings, 0 replies; 3+ messages in thread
From: Sun, Zailiang @ 2019-04-18  4:52 UTC (permalink / raw)
  To: devel; +Cc: David Wei, Yi Qian

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>
---
 Vlv2TbltDevicePkg/PlatformPkg.fdf       |  4 ----
 Vlv2TbltDevicePkg/PlatformPkgConfig.dsc |  2 +-
 Vlv2TbltDevicePkg/PlatformPkgGcc.fdf    | 16 ++++++++--------
 Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc |  7 ++-----
 Vlv2TbltDevicePkg/PlatformPkgIA32.dsc   |  2 --
 Vlv2TbltDevicePkg/PlatformPkgX64.dsc    |  2 --
 6 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index fc09618ef4..1bdf0e3f44 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -685,10 +685,6 @@ INF $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.inf
 
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf
 
-  #
-  # Legacy Modules
-  #
-INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
 
 #
 # FAT file system
diff --git a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
index c8e9dd3a53..6d556c1be2 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
@@ -36,7 +36,7 @@ DEFINE CLKGEN_CONFIG_EXTRA_ENABLE=TRUE
 # TRUE  - HPET timer is used.
 # FALSE - 8254 timer is used.
 #
-DEFINE USE_HPET_TIMER = FALSE
+DEFINE USE_HPET_TIMER = TRUE
 
 
 #
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 25141eb44b..102ba46c5b 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -133,7 +133,7 @@ FILE = $(WORKSPACE)/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageFtwSpare.bin
 
   $(FLASH_REGION_FSPBIN_OFFSET)|$(FLASH_REGION_FSPBIN_SIZE)
   gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize
-  FILE = Vlv2MiscBinariesPkg/FspBinary/FvFsp.bin
+  FILE = Vlv2SocBinPkg/FspBinary/FvFsp.bin
 
 
   $(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 $(PLATFORM_PACKAGE)/Metronome/Metronome.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
+!endif
 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
 INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
 INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
@@ -521,7 +525,7 @@ INF $(PLATFORM_PACKAGE)/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf
  INF $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf
  FILE DRIVER = FF0C8745-3270-4439-B74F-3E45F8C77064 {
   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"
 }
 !endif
@@ -636,10 +640,6 @@ INF $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.inf
 
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf
 
-  #
-  # Legacy Modules
-  #
-INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
 
 #
 # FAT file system
@@ -660,7 +660,7 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
 
 !if $(GOP_DRIVER_ENABLE) == TRUE
 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"
 }
 !endif
@@ -670,7 +670,7 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
 #
 !if $(NETWORK_ENABLE) == TRUE
   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"
   }
   INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index cd5aff4669..b3642c5c7a 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -26,7 +26,7 @@
   #
   DEFINE      PLATFORM_PACKAGE                = Vlv2TbltDevicePkg
   DEFINE      PLATFORM_RC_PACKAGE             = Vlv2DeviceRefCodePkg
-  DEFINE      PLATFORM_BINARY_PACKAGE         = Vlv2BinaryPkg
+  DEFINE      PLATFORM_BINARY_PACKAGE         = Vlv2SocBinPkg
   OUTPUT_DIRECTORY                    = Build/$(PLATFORM_PACKAGE)
   SUPPORTED_ARCHITECTURES             = IA32|X64
   BUILD_TARGETS                       = DEBUG|RELEASE
@@ -1424,15 +1424,12 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   #
   # CPU/FW Microde
   #
-  Vlv2MiscBinariesPkg/Microcode/MicrocodeUpdates.inf {
+  Vlv2SocBinPkg/Microcode/MicrocodeUpdates.inf {
     <BuildOptions>
       *_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF
   }
 
 
-  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
-
-
 !if $(NETWORK_ENABLE) == TRUE
   !if $(NETWORK_ISCSI_ENABLE) == TRUE
     NetworkPkg/IScsiDxe/IScsiDxe.inf
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 5735bcb9a9..28e6f5a181 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1420,8 +1420,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   }
 
 
-  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
-
 
 !if $(NETWORK_ENABLE) == TRUE
   !if $(NETWORK_ISCSI_ENABLE) == TRUE
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 45675e1d57..f9ba56ef4b 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1432,8 +1432,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   }
 
 
-  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
-
 
 !if $(NETWORK_ENABLE) == TRUE
   !if $(NETWORK_ISCSI_ENABLE) == TRUE
-- 
2.19.1.windows.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-18  4:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-17  7:24 [PATCH] Vlv2TbltDevicePkg: Retire 8254 timer and 8259 module Sun, Zailiang
2019-04-17  8:09 ` Qian, Yi
  -- strict thread matches above, loose matches on Subject: below --
2019-04-18  4:52 Sun, Zailiang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox