QuarkPlatformPkg: Set PcdSpeculationBarrierType to CPUID

[mirror_edk2.git] / QuarkPlatformPkg / Quark.dsc

diff --git a/QuarkPlatformPkg/Quark.dsc b/QuarkPlatformPkg/Quark.dsc
index 5624451e12b703c41ba462d609429b7b1ac96312..96ddc1565a8a12f609b8d92f1bcf310312485f33 100644 (file)
--- a/QuarkPlatformPkg/Quark.dsc
+++ b/QuarkPlatformPkg/Quark.dsc
@@ -2,15 +2,9 @@
 # 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 - 2017 Intel Corporation.\r
+# Copyright (c) 2013 - 2019 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
-# which accompanies this distribution.  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
@@ -119,7 +113,7 @@
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf\r
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
-  UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf\r
+  UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf\r
   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf\r
   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf\r
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf\r
@@ -231,6 +225,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
@@ -239,6 +235,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
@@ -279,6 +276,7 @@
 !endif\r
 \r
 [LibraryClasses.IA32.DXE_SMM_DRIVER]\r
+  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf\r
   SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf\r
   ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf\r
   MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf\r
@@ -450,6 +448,11 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName|L"QUARKREC.Cap"\r
 !endif\r
 \r
+  #\r
+  # Quark does not support LFENCE.  Use CPUID as speculation barrier\r
+  #\r
+  gEfiMdePkgTokenSpaceGuid.PcdSpeculationBarrierType|0x02\r
+\r
 [PcdsPatchableInModule]\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803000C7\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0\r
@@ -617,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
@@ -890,8 +893,6 @@
   ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {\r
     <PcdsFixedAtBuild>\r
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
-    <LibraryClasses>\r
-      PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf\r
   }\r
 !endif\r
 \r
@@ -921,7 +922,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