OvmfPkg: reorganize TPM2 support in DSC/FDF files

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.dsc

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index ed54181180f8d0f447ca1ad53f3df6fcf0669bc7..af40075e34b5d0ddb3ce775dd9a7f0f9e71803b0 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -67,7 +67,7 @@
   GCC:RELEASE_*_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
   INTEL:RELEASE_*_*_CC_FLAGS           = /D MDEPKG_NDEBUG\r
   MSFT:RELEASE_*_*_CC_FLAGS            = /D MDEPKG_NDEBUG\r
-!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(TOOL_CHAIN_TAG) != "CLANG9"\r
+!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(TOOL_CHAIN_TAG) != "CLANGPDB"\r
   GCC:*_*_*_CC_FLAGS                   = -mno-mmx -mno-sse\r
 !endif\r
 !if $(SOURCE_DEBUG_ENABLE) == TRUE\r
@@ -86,14 +86,14 @@
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
   XCODE:*_*_*_DLINK_FLAGS =\r
-  CLANGPE: *_*_*_DLINK_FLAGS = /ALIGN:4096\r
+  CLANGPDB:*_*_*_DLINK_FLAGS = /ALIGN:4096\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
 [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
   XCODE:*_*_*_DLINK_FLAGS =\r
-  CLANGPE: *_*_*_DLINK_FLAGS = /ALIGN:4096\r
+  CLANGPDB:*_*_*_DLINK_FLAGS = /ALIGN:4096\r
 \r
 ################################################################################\r
 #\r
@@ -436,6 +436,7 @@
 !if $(SMM_REQUIRE) == TRUE\r
   gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdEnableVariableRuntimeCache|FALSE\r
 !endif\r
 \r
 [PcdsFixedAtBuild]\r
@@ -642,9 +643,6 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf\r
       NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf\r
   }\r
-!if $(TPM2_CONFIG_ENABLE) == TRUE\r
-  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
-!endif\r
 !endif\r
 \r
   #\r
@@ -913,6 +911,9 @@
   }\r
 !endif\r
 \r
+  #\r
+  # TPM2 support\r
+  #\r
 !if $(TPM2_ENABLE) == TRUE\r
   SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {\r
     <LibraryClasses>\r
@@ -925,4 +926,7 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf\r
       NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf\r
   }\r
+!if $(TPM2_CONFIG_ENABLE) == TRUE\r
+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
+!endif\r
 !endif\r