From 62c9131aae6393543e3cec5d3a8024d9dc23346b Mon Sep 17 00:00:00 2001 From: Michael Kinney Date: Fri, 29 Jan 2016 23:38:58 +0000 Subject: [PATCH 1/1] QuarkPlatformPkg: Add modules required for TCG MOR feature 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 Cc: Jiewen Yao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney Reviewed-by: Kelly Steele Reviewed-by: Jiewen Yao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19777 6f19259b-4bc3-4df7-8a09-765794883524 --- QuarkPlatformPkg/Quark.dsc | 3 +++ QuarkPlatformPkg/Quark.fdf | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/QuarkPlatformPkg/Quark.dsc b/QuarkPlatformPkg/Quark.dsc index be6b83d22d..c87bb176e9 100644 --- a/QuarkPlatformPkg/Quark.dsc +++ b/QuarkPlatformPkg/Quark.dsc @@ -184,6 +184,7 @@ !if $(TPM_12_HARDWARE) == INFINEON_I2C Tpm12DeviceLib|QuarkPlatformPkg/Library/Tpm12DeviceLibInfineonI2c/Tpm12DeviceLibInfineonI2c.inf !endif + TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf !else TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf !endif @@ -843,7 +844,9 @@ # Trusted Platform Module # !if $(MEASURED_BOOT_ENABLE) + SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf SecurityPkg/Tcg/TcgDxe/TcgDxe.inf + SecurityPkg/Tcg/TcgSmm/TcgSmm.inf !endif # diff --git a/QuarkPlatformPkg/Quark.fdf b/QuarkPlatformPkg/Quark.fdf index c196d21274..9f51eb3747 100644 --- a/QuarkPlatformPkg/Quark.fdf +++ b/QuarkPlatformPkg/Quark.fdf @@ -574,7 +574,9 @@ INF FatPkg/EnhancedFatDxe/Fat.inf # Trusted Platform Module # !if $(MEASURED_BOOT_ENABLE) +INF SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf +INF RuleOverride = DRIVER_ACPITABLE SecurityPkg/Tcg/TcgSmm/TcgSmm.inf !endif ################################################################################ @@ -724,6 +726,16 @@ INF RuleOverride = TIANOCOMPRESSED PerformancePkg/Dp_App/Dp.inf VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } +[Rule.Common.DXE_SMM_DRIVER.DRIVER_ACPITABLE] + FILE SMM = $(NAMED_GUID) { + DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex + PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi + RAW ACPI Optional |.acpi + RAW ASL Optional |.aml + UI STRING="$(MODULE_NAME)" Optional + VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) + } + [Rule.Common.SMM_CORE] FILE SMM_CORE = $(NAMED_GUID) { PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi -- 2.39.2