diff options
| author | Dong, Guo <guo.dong@intel.com> | 2014-08-28 05:31:09 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-08-28 05:31:09 +0000 |
| commit | 60c944c7d63978eee337f52af360ca5d807c11b6 (patch) | |
| tree | a0093c20ea79b1a64fc250f75e54e34cd4d45c95 /SecurityPkg/Tcg/TrEEConfig | |
| parent | 5841ba45f2d9dee54c2cf20ea374761207f3bb92 (diff) | |
| download | edk2-platforms-60c944c7d63978eee337f52af360ca5d807c11b6.tar.xz | |
SecurityPkg: INF/DEC file updates to EDK II packages
1. Usage information in INF file comment blocks are either incomplete or incorrect.
This includes usage information for Protocols/PPIs/GUIDs/PCDs/HOBs/Events/BootModes.
The syntax for usage information in comment blocks is defined in the EDK II Module Information (INF) Specification
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dong, Guo <guo.dong@intel.com>
Reviewed-by: Gao, Liming <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15950 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'SecurityPkg/Tcg/TrEEConfig')
| -rw-r--r-- | SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf | 25 | ||||
| -rw-r--r-- | SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf | 28 |
2 files changed, 38 insertions, 15 deletions
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf index 042ad878d6..9935e40497 100644 --- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf +++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf @@ -1,8 +1,10 @@ ## @file
-# Component name for TrEE configuration module.
+# TPM device configuration for TPM 2.0
+#
+# By this module, user may select TPM device, clear TPM state, etc.
# NOTE: This module is only for reference only, each platform should have its own setup page.
#
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
@@ -15,6 +17,7 @@ [Defines]
INF_VERSION = 0x00010005
BASE_NAME = TrEEConfigDxe
+ MODULE_UNI_FILE = TrEEConfigDxe.uni
FILE_GUID = 3141FD4D-EA02-4a70-9BCE-97EE837319AC
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
@@ -52,24 +55,34 @@ PcdLib
PrintLib
Tpm2DeviceLib
- Tpm12DeviceLib
Tpm2CommandLib
[Guids]
+ ## SOMETIMES_PRODUCES ## Variable:L"TrEEPhysicalPresence"
+ ## SOMETIMES_CONSUMES ## Variable:L"TrEEPhysicalPresence"
gEfiTrEEPhysicalPresenceGuid
+
+ ## PRODUCES ## HII
+ ## SOMETIMES_PRODUCES ## Variable:L"TREE_CONFIGURATION"
+ ## SOMETIMES_CONSUMES ## Variable:L"TREE_CONFIGURATION"
+ ## PRODUCES ## Variable:L"TREE_DEVICE_DETECTION"
+ ## SOMETIMES_CONSUMES ## Variable:L"TREE_DEVICE_DETECTION"
gTrEEConfigFormSetGuid
[Protocols]
gEfiHiiConfigAccessProtocolGuid ## PRODUCES
- gEfiHiiConfigRoutingProtocolGuid ## CONSUMES
+ gEfiDevicePathProtocolGuid ## PRODUCES
gEdkiiVariableLockProtocolGuid ## CONSUMES
[Pcd]
- gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid
+ gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid ## CONSUMES
[Depex]
gEfiTrEEProtocolGuid AND
gEfiHiiConfigRoutingProtocolGuid AND
gEfiHiiDatabaseProtocolGuid AND
gEfiVariableArchProtocolGuid AND
- gEfiVariableWriteArchProtocolGuid
\ No newline at end of file + gEfiVariableWriteArchProtocolGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+ TrEEConfigDxeExtra.uni
\ No newline at end of file diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf index c3a8435391..31807cb06e 100644 --- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf +++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf @@ -1,5 +1,7 @@ ## @file
-# Component name for TrEE configuration module.
+# Set TPM device type
+#
+# This module initializes TPM device type based on variable and detection.
# NOTE: This module is only for reference only, each platform should have its own setup page.
#
# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
@@ -15,6 +17,7 @@ [Defines]
INF_VERSION = 0x00010005
BASE_NAME = TrEEConfigPei
+ MODULE_UNI_FILE = TrEEConfigPei.uni
FILE_GUID = A5C1EF72-9379-4370-B4C7-0F5126CAC38E
MODULE_TYPE = PEIM
VERSION_STRING = 1.0
@@ -23,6 +26,9 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
+# [BootMode]
+# S3_RESUME ## SOMETIMES_CONSUMES
+#
[Sources]
TrEEConfigPeim.c
@@ -48,19 +54,23 @@ Tpm12DeviceLib
[Guids]
- gEfiTrEEPhysicalPresenceGuid
+ ## SOMETIMES_CONSUMES ## Variable:L"TREE_CONFIGURATION"
+ ## SOMETIMES_CONSUMES ## Variable:L"TREE_DEVICE_DETECTION"
gTrEEConfigFormSetGuid
- gEfiTpmDeviceSelectedGuid
+ gEfiTpmDeviceSelectedGuid ## PRODUCES ## GUID # Used as a PPI GUID
[Ppis]
- gEfiPeiReadOnlyVariable2PpiGuid
+ gEfiPeiReadOnlyVariable2PpiGuid ## CONSUMES
[Pcd]
- gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid
- gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy
- gEfiSecurityPkgTokenSpaceGuid.PcdTpmAutoDetection
- gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress
+ gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid ## PRODUCES
+ gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy ## PRODUCES
+ gEfiSecurityPkgTokenSpaceGuid.PcdTpmAutoDetection ## CONSUMES
+ gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress ## SOMETIMES_CONSUMES
[Depex]
gEfiPeiMasterBootModePpiGuid AND
- gEfiPeiReadOnlyVariable2PpiGuid
\ No newline at end of file + gEfiPeiReadOnlyVariable2PpiGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+ TrEEConfigPeiExtra.uni
\ No newline at end of file |