diff options
| author | Steven Kinney <steven.kinney@amd.com> | 2014-04-17 13:42:47 -0500 |
|---|---|---|
| committer | Steven Kinney <steven.kinney@amd.com> | 2014-04-17 13:42:47 -0500 |
| commit | 5261f4659a94e49046d26c6d6d2b2f75d7aca289 (patch) | |
| tree | c85e326534133066ae301b48525d034a4735b2a6 /SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf | |
| parent | 4533f02a98912c745b036d8e6e836e942f244d12 (diff) | |
| parent | 48c8a38e05b73fc8b8eb72dbbdafa02a81b97818 (diff) | |
Fix merge conflicts.linaro-edk2-2014.04
Merge branch 'release-prep'
Conflicts:
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
Signed-off-by: Steven Kinney <steven.kinney@amd.com>
Diffstat (limited to 'SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf')
| -rw-r--r-- | SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf index 5b257aea0..41e85c015 100644 --- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf +++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf @@ -99,10 +99,11 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize
[FeaturePcd]
- gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics ## SOMETIME_CONSUMES (statistic the information of variable.)
+ gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics ## CONSUMES # statistic the information of variable.
+ gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate ## CONSUMES
[Depex]
- gEfiFirmwareVolumeBlockProtocolGuid AND gEfiFaultTolerantWriteProtocolGuid
+ TRUE
# [Event]
# ##
|