tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SecurityPkg/TcgConfigDxe: Replace TpmCommLib with Tpm12DeviceLib 

Update TCG drivers for TPM 1.2 devices to use Tpm12DeviceLib instead
of TpmCommLib.  This is required to support TPM 1.2 hardware devices
that are not on LPC bus.

Cc: Chao Zhang <chao.b.zhang@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: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19723 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Michael Kinney 2016-01-21 19:29:35 +00:00 committed by mdkinney
parent 7cb1b15bea
commit c132457ea7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
The module entry point for Tcg configuration module. The module entry point for Tcg configuration module.
Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -43,7 +43,7 @@ TcgConfigDriverEntryPoint (
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
Status = TisPcRequestUseTpm ((TIS_TPM_HANDLE) (UINTN) TPM_BASE_ADDRESS); Status = Tpm12RequestUseTpm ();
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "TPM not detected!\n")); DEBUG ((EFI_D_ERROR, "TPM not detected!\n"));
return Status; return Status;

4
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
View File

@ -2,7 +2,7 @@
# Provides the capability to update TPM state setup browser # Provides the capability to update TPM state setup browser
# By this module, user may enable/disable/activate/deactivate/clear TPM, etc. # By this module, user may enable/disable/activate/deactivate/clear TPM, etc.
# #
# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 # which accompanies this distribution. The full text of the license may be found at
@ -52,7 +52,7 @@
HiiLib HiiLib
PcdLib PcdLib
PrintLib PrintLib
TpmCommLib Tpm12DeviceLib
[Guids] [Guids]
## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence" ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"

4
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h
View File

@ -2,7 +2,7 @@
The header file of HII Config Access protocol implementation of TCG The header file of HII Config Access protocol implementation of TCG
configuration module. configuration module.
Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/DevicePathLib.h> #include <Library/DevicePathLib.h>
#include <Library/PcdLib.h> #include <Library/PcdLib.h>
#include <Library/PrintLib.h> #include <Library/PrintLib.h>
#include <Library/TpmCommLib.h> #include <Library/Tpm12DeviceLib.h>
#include <Guid/MdeModuleHii.h> #include <Guid/MdeModuleHii.h>