edk2: Reformat TianoCore Contribution Agreement 1.1

[mirror_edk2.git] / Vlv2TbltDevicePkg / PlatformPkgX64.dsc

diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index a176041e2951247ad3737f81487dfd65ecae5ba6..0f0eaaba6c7446e7d2e637946b5a7e78d523656f 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -119,6 +119,7 @@
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf\r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
   PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf\r
+  PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
   PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf\r
   PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf\r
   CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf\r
@@ -149,6 +150,7 @@
   NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
   DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r
   FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLib.inf\r
+  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf\r
   #\r
   # Framework\r
   #\r
@@ -182,10 +184,15 @@
 \r
   OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf\r
 !if $(CAPSULE_ENABLE) == TRUE\r
- CapsuleLib|IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf\r
+  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf\r
 !else\r
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
 !endif\r
+  EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.inf\r
+  FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf\r
+  IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf\r
+  PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf\r
+  MicrocodeFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf\r
   LanguageLib|EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.inf\r
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf\r
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf\r
@@ -326,14 +333,15 @@
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf\r
 !else\r
-  DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+  DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
   SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
 !endif\r
 \r
   LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf\r
   HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf\r
-  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf\r
-  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
+  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf\r
+!endif\r
 \r
  !if $(MINNOW2_FSP_BUILD) == TRUE\r
  PlatformFspLib|Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf\r
@@ -380,6 +388,8 @@
   DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf\r
 !endif\r
 \r
+  FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLibDxe.inf\r
+\r
 [LibraryClasses.X64.DXE_CORE]\r
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
   MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf\r
@@ -431,11 +441,6 @@
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
 !endif\r
 \r
-!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf\r
-  TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf\r
-!endif\r
-\r
 [LibraryClasses.X64.DXE_RUNTIME_DRIVER]\r
   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
@@ -449,6 +454,10 @@
   DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf\r
 !endif\r
 \r
+!if $(CAPSULE_ENABLE) == TRUE\r
+  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf\r
+!endif\r
+\r
 [LibraryClasses.common.UEFI_DRIVER]\r
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
 \r
@@ -604,6 +613,10 @@
 \r
   gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE\r
 \r
+!if $(SOURCE_DEBUG_ENABLE)\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug|TRUE\r
+!endif\r
+\r
 [PcdsFixedAtBuild.common]\r
 !if $(MINNOW2_FSP_BUILD) == TRUE\r
 # $(FLASH_REGION_VLVMICROCODE_BASE)\r
@@ -682,6 +695,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17\r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE\r
+  gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|2\r
 !endif\r
 \r
 [PcdsFixedAtBuild.IA32.PEIM, PcdsFixedAtBuild.IA32.PEI_CORE, PcdsFixedAtBuild.IA32.SEC]\r
@@ -693,6 +707,10 @@
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07\r
 !endif\r
 \r
+!if $(RECOVERY_ENABLE)\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName|L"VLV2REC.Cap"\r
+!endif\r
+\r
 [PcdsPatchableInModule.common]\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x$(PLATFORM_PCIEXPRESS_BASE)\r
@@ -884,6 +902,12 @@
   gEfiVLVTokenSpaceGuid.PcdCpuSmramCpuDataAddress|0\r
   gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0\r
 \r
+!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
+  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor|{0x0}|VOID*|0x100\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0x7b, 0x26, 0x96, 0x40, 0x0a, 0xda, 0xeb, 0x42, 0xb5, 0xeb, 0xfe, 0xf3, 0x1d, 0x20, 0x7c, 0xb4}\r
+  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid|{0xb2, 0x9e, 0x9c, 0xaf, 0xad, 0x12, 0x3e, 0x4d, 0xa4, 0xd4, 0x96, 0xf6, 0xc9, 0x96, 0x62, 0x15}\r
+!endif\r
+\r
 [Components.IA32]\r
 \r
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SecCore.inf\r
@@ -905,6 +929,14 @@
   }\r
   !endif\r
 \r
+!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
+  # FMP image decriptor\r
+  Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf {\r
+    <LibraryClasses>\r
+      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
+  }\r
+!endif\r
+\r
   MdeModulePkg/Core/Pei/PeiMain.inf {\r
 !if $(TARGET) == DEBUG\r
     <PcdsFixedAtBuild>\r
@@ -1004,13 +1036,31 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MpS3.inf\r
   EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/AcpiVariableHobOnSmramReserveHobThunk.inf\r
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommunicationPei.inf\r
+\r
+!if $(RECOVERY_ENABLE)\r
+  #\r
+  # Recovery\r
+  #\r
+  $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchUsb.inf\r
+  MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf\r
+  MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf\r
+  MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf\r
+  FatPkg/FatPei/FatPei.inf\r
+  MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf\r
+  SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf {\r
+    <LibraryClasses>\r
+      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf\r
+      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
+  }\r
+!endif\r
+\r
 !if $(CAPSULE_ENABLE) == TRUE\r
   MdeModulePkg/Universal/CapsulePei/CapsulePei.inf\r
 !endif\r
   MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {\r
     <LibraryClasses>\r
 !if $(LZMA_ENABLE) == TRUE\r
-    NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
+    NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
 !endif\r
   }\r
 \r
@@ -1067,7 +1117,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
       NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf\r
 !endif\r
 !if $(LZMA_ENABLE) == TRUE\r
-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
+      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
 !endif\r
 !if $(TARGET) != RELEASE\r
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
@@ -1104,9 +1154,12 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 !if $(CAPSULE_ENABLE) == TRUE\r
   MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf {\r
     <LibraryClasses>\r
-    PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-    MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
-    HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
+      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
+      MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
+      HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
+      DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf\r
+!endif\r
   }\r
 !endif\r
 \r
@@ -1138,6 +1191,11 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
       SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
+!if $(CAPSULE_ENABLE)\r
+      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
+!else\r
+      FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf\r
+!endif\r
     !if $(FTPM_ENABLE) == TRUE\r
       Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf\r
     !else\r
@@ -1504,6 +1562,37 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 \r
   Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf\r
 \r
+!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)\r
+  MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf\r
+  MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf\r
+!endif\r
+\r
+!if $(CAPSULE_ENABLE)\r
+  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf {\r
+    <LibraryClasses>\r
+      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
+      SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
+      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
+  }\r
+  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf {\r
+    <LibraryClasses>\r
+      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
+      SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
+      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
+  }\r
+!endif\r
+\r
+!if $(MICOCODE_CAPSULE_ENABLE)\r
+  UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf {\r
+    <LibraryClasses>\r
+      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
+      SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
+  }\r
+!endif\r
+\r
 [BuildOptions]\r
 #\r
 # Define Build Options both for EDK and EDKII drivers.\r
@@ -1584,6 +1673,22 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 \r
 !endif\r
 \r
+#\r
+# Force PE/COFF sections to be aligned at 4KB boundaries to support page level\r
+# protection of DXE_RUNTIME_DRIVER modules\r
+#\r
+[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
+  MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096\r
+  GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
+\r
+#\r
+# Force PE/COFF sections to be aligned at 4KB boundaries to support page level\r
+# protection of DXE_SMM_DRIVER/SMM_CORE modules\r
+#\r
+[BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]\r
+  MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096\r
+  GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
+\r
 [BuildOptions.Common.EDK]\r
 \r
 #\r