QuarkPlatformPkg: Add modules required for TCG MOR feature
authorMichael Kinney <michael.d.kinney@intel.com>
Fri, 29 Jan 2016 23:38:58 +0000 (23:38 +0000)
committermdkinney <mdkinney@Edk2>
Fri, 29 Jan 2016 23:38:58 +0000 (23:38 +0000)
Add the TcgSmm and TcgMor modules that are required to manage
UEFI variable that conveys TCG MOR request to memory init module
in PEI phase.

Cc: Kelly Steele <kelly.steele@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Kelly Steele <kelly.steele@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19777 6f19259b-4bc3-4df7-8a09-765794883524

QuarkPlatformPkg/Quark.dsc
QuarkPlatformPkg/Quark.fdf

index be6b83d..c87bb17 100644 (file)
 !if $(TPM_12_HARDWARE) == INFINEON_I2C\r
   Tpm12DeviceLib|QuarkPlatformPkg/Library/Tpm12DeviceLibInfineonI2c/Tpm12DeviceLibInfineonI2c.inf\r
 !endif\r
+  TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf\r
 !else\r
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
 !endif\r
   # Trusted Platform Module\r
   #\r
 !if $(MEASURED_BOOT_ENABLE)\r
+  SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf\r
   SecurityPkg/Tcg/TcgDxe/TcgDxe.inf\r
+  SecurityPkg/Tcg/TcgSmm/TcgSmm.inf\r
 !endif\r
 \r
   #\r
index c196d21..9f51eb3 100644 (file)
@@ -574,7 +574,9 @@ INF  FatPkg/EnhancedFatDxe/Fat.inf
 # Trusted Platform Module\r
 #\r
 !if $(MEASURED_BOOT_ENABLE)\r
+INF  SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf\r
 INF  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf\r
+INF  RuleOverride = DRIVER_ACPITABLE SecurityPkg/Tcg/TcgSmm/TcgSmm.inf\r
 !endif\r
 \r
 ################################################################################\r
@@ -724,6 +726,16 @@ INF  RuleOverride = TIANOCOMPRESSED PerformancePkg/Dp_App/Dp.inf
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
+[Rule.Common.DXE_SMM_DRIVER.DRIVER_ACPITABLE]\r
+  FILE SMM = $(NAMED_GUID) {\r
+    DXE_DEPEX DXE_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+    RAW ACPI  Optional                |.acpi\r
+    RAW ASL   Optional                |.aml\r
+    UI        STRING="$(MODULE_NAME)" Optional\r
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+  }\r
+\r
 [Rule.Common.SMM_CORE]\r
   FILE SMM_CORE = $(NAMED_GUID) {\r
     PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi\r