ArmVirtPkg: restrict mapping attributes of normal memory to EFI_MEMORY_WB

[mirror_edk2.git] / Vlv2TbltDevicePkg / PlatformPkgGccX64.dsc

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 7995bac946e3657cb45d82ec150a3482a5f65ef5..7125366681cd6d05ddd2ddb9d201eb9981d2ab1a 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.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
@@ -400,6 +401,8 @@
   LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf\r
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
   SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf\r
+  SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf\r
+  SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf\r
 \r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf\r
   !if $(TARGET) != RELEASE\r
@@ -614,7 +617,7 @@
 # $(FLASH_AREA_SIZE)\r
   gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000\r
 # $(FLASH_REGION_FSPBIN_BASE)\r
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000\r
+  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFCC0000\r
 !endif\r
 \r
 !if $(PERFORMANCE_ENABLE) == TRUE\r
@@ -698,7 +701,7 @@
 \r
   ## This PCD specifies whether to use the optimized timing for best PS2 detection performance.\r
   #  Note this PCD could be set to TRUE for best boot performance and set to FALSE for best device compatibility.\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE\r
 \r
   #######################################################################################################\r
   #\r
@@ -1089,7 +1092,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     !endif\r
        <BuildOptions>\r
         ICC:*_*_*_CC_FLAGS = -D MDEPKG_NDEBUG\r
-        GCC:*_*_*_CC_FLAGS = -D MDEPKG_NDEBUG\r
+        GCC:RELEASE_*_*_CC_FLAGS = -D MDEPKG_NDEBUG\r
   }\r
   MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {\r
     <LibraryClasses>\r
@@ -1330,10 +1333,10 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
            SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
      !endif\r
   }\r
-  $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf\r
+  UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf\r
   UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf\r
   MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf\r
-  $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf\r
+  UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf\r
   $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf\r
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf\r
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf\r