BaseTools/Capsule: Do not support -o with --dump-info

[mirror_edk2.git] / QuarkPlatformPkg / Quark.dsc

diff --git a/QuarkPlatformPkg/Quark.dsc b/QuarkPlatformPkg/Quark.dsc
index 0bd9120a7fdd26882e0ebe881eeb3adad309935c..14142087bdaaaec68003c1c5a68cfcdec0550760 100644 (file)
--- a/QuarkPlatformPkg/Quark.dsc
+++ b/QuarkPlatformPkg/Quark.dsc
@@ -2,7 +2,7 @@
 # Clanton Peak CRB platform with 32-bit DXE for 4MB/8MB flash devices.\r
 #\r
 # This package provides Clanton Peak CRB platform specific modules.\r
-# Copyright (c) 2013 - 2016 Intel Corporation.\r
+# Copyright (c) 2013 - 2018 Intel Corporation.\r
 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
@@ -126,6 +126,7 @@
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf\r
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
+  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf\r
 \r
   #\r
   # Generic Modules\r
@@ -162,6 +163,9 @@
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
 !endif\r
 \r
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
+\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
@@ -227,6 +231,8 @@
 \r
 !if $(CAPSULE_ENABLE)\r
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf\r
+  BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf\r
+  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf\r
 !else\r
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
 !endif\r
@@ -235,6 +241,7 @@
   FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf\r
   IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf\r
   PlatformFlashAccessLib|QuarkPlatformPkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.inf\r
+  DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibText/DisplayUpdateProgressLibText.inf\r
 \r
 [LibraryClasses.common.SEC]\r
   #\r
@@ -613,7 +620,7 @@
   # Trusted Platform Module\r
   #\r
 !if $(MEASURED_BOOT_ENABLE)\r
-  SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf\r
+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
   SecurityPkg/Tcg/TcgPei/TcgPei.inf\r
 !endif\r
 \r
@@ -701,7 +708,6 @@
   #\r
   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {\r
     <LibraryClasses>\r
-      UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf\r
       PlatformBootManagerLib|QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf\r
 !if $(CAPSULE_ENABLE)\r
       FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
@@ -715,7 +721,6 @@
       NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf\r
       NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf\r
 \r
-      UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf\r
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
   }\r
 \r
@@ -865,9 +870,6 @@
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
   FatPkg/EnhancedFatDxe/Fat.inf\r
-!if $(PERFORMANCE_ENABLE)\r
-  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
-!endif\r
 \r
   #\r
   # Capsule update\r
@@ -888,10 +890,11 @@
   # Performance Application\r
   #\r
 !if $(PERFORMANCE_ENABLE)\r
-  PerformancePkg/Dp_App/Dp.inf {\r
+  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {\r
+    <PcdsFixedAtBuild>\r
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
     <LibraryClasses>\r
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
+      PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf\r
   }\r
 !endif\r
 \r
@@ -911,8 +914,6 @@
       NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf\r
       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf\r
       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf\r
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
       BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf\r
 \r
@@ -923,7 +924,7 @@
   }\r
 \r
 !if $(CAPSULE_ENABLE)\r
-  MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf\r
+  MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf\r
 \r
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf {\r
     <LibraryClasses>\r
@@ -942,3 +943,9 @@
 \r
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
   MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096\r
+\r
+# Force PE/COFF sections to be aligned at 4KB boundaries to support page level protection of DXE_SMM_DRIVER/SMM_CORE modules\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