Vlv2TbltDevicePkg: Use CpuDxe from UefiCpuPkg

[mirror_edk2.git] / Vlv2TbltDevicePkg / PlatformPkg.fdf

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index f976b9fa4057e14c6e639103259d504efd926529..c725cdcf31f35ae4ebf44ae9b711405a683f3459 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -1,15 +1,9 @@
 #/** @file\r
 # FDF file of Platform.\r
 #\r
-# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.<BR>\r
 #\r
-# This program and the accompanying materials are licensed and made available under\r
-# the terms and conditions of the BSD License that accompanies this distribution.\r
-# The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php.\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 #\r
 #**/\r
@@ -183,7 +177,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTok
 \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
@@ -316,7 +310,6 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmControl.inf\r
 INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf\r
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MpS3.inf\r
-INF EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/AcpiVariableHobOnSmramReserveHobThunk.inf\r
 !endif\r
 \r
 # INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommunicationPei.inf\r
@@ -465,10 +458,14 @@ INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRou
 INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf\r
 INF MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf\r
 INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
-INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MpCpu.inf\r
+INF UefiCpuPkg/CpuDxe/CpuDxe.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
@@ -572,7 +569,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
@@ -679,15 +676,7 @@ INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
 INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
 !endif\r
 \r
-  #\r
-  #  ECP\r
-  #\r
-INF EdkCompatibilityPkg/Compatibility/LegacyRegion2OnLegacyRegionThunk/LegacyRegion2OnLegacyRegionThunk.inf\r
-INF EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBaseOnSmmBase2Thunk.inf\r
-INF EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.inf\r
-INF EdkCompatibilityPkg/Compatibility/SmmAccess2OnSmmAccessThunk/SmmAccess2OnSmmAccessThunk.inf\r
-INF EdkCompatibilityPkg/Compatibility/SmmControl2OnSmmControlThunk/SmmControl2OnSmmControlThunk.inf\r
-INF EdkCompatibilityPkg/Compatibility/FvOnFv2Thunk/FvOnFv2Thunk.inf\r
+\r
   #\r
   # SMBIOS\r
   #\r
@@ -696,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
@@ -720,7 +705,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
@@ -730,7 +715,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
@@ -743,11 +728,9 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
   INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
   INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
   INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
   !if $(NETWORK_IP6_ENABLE) == TRUE\r
   INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
   INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
-  INF  NetworkPkg/IpSecDxe/IpSecDxe.inf\r
   INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
   INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
   !endif\r