Fix TPM detection

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
This commit is contained in:
Patrick Rudolph
2021-02-02 19:17:03 +01:00
committed by Tim Crawford
parent 9657bbe08f
commit 654e5958cd

View File

@@ -143,23 +143,23 @@ BlDxeEntryPoint (
Status = PcdSet64S (PcdPciExpressBaseSize, AcpiBoardInfo->PcieBaseSize); Status = PcdSet64S (PcdPciExpressBaseSize, AcpiBoardInfo->PcieBaseSize);
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
if (AcpiBoardInfo->TPM12Present) if (AcpiBoardInfo->TPM20Present)
{
Size = sizeof (gEfiTpmDeviceInstanceTpm12Guid);
Status = PcdSetPtrS (
PcdTpmInstanceGuid,
&Size,
&gEfiTpmDeviceInstanceTpm12Guid
);
ASSERT_EFI_ERROR (Status);
}
else if (AcpiBoardInfo->TPM20Present)
{ {
Size = sizeof (gEfiTpmDeviceInstanceTpm20DtpmGuid); Size = sizeof (gEfiTpmDeviceInstanceTpm20DtpmGuid);
Status = PcdSetPtrS (
PcdTpmInstanceGuid,
&Size,
&gEfiTpmDeviceInstanceTpm20DtpmGuid
);
ASSERT_EFI_ERROR (Status);
}
else if (AcpiBoardInfo->TPM12Present)
{
Size = sizeof (gEfiTpmDeviceInstanceTpm12Guid);
Status = PcdSetPtrS ( Status = PcdSetPtrS (
PcdTpmInstanceGuid, PcdTpmInstanceGuid,
&Size, &Size,
&gEfiTpmDeviceInstanceTpm20DtpmGuid &gEfiTpmDeviceInstanceTpm12Guid
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
} }