Skip to content

Commit

Permalink
[FFA] Fixed an issue of symbol unresolved when enabling TPM (#1102)
Browse files Browse the repository at this point in the history
## Description

The `TpmServiceLib` is not linkable when there is library class
specified because its inf does not pertain the same logic of linking
`TpmServiceLib`.

This change moved it to NULL library class so that it will be linked
according to the build flag.

For details on how to complete these options and their meaning refer to
[CONTRIBUTING.md](https://github.com/microsoft/mu/blob/HEAD/CONTRIBUTING.md).

- [x] Impacts functionality?
- [ ] Impacts security?
- [ ] Breaking change?
- [ ] Includes tests?
- [ ] Includes documentation?

## How This Was Tested

This was tested buildable for QEMU SBSA.

## Integration Instructions

N/A
  • Loading branch information
kuqin12 authored Jan 21, 2025
1 parent 526cf8d commit 218ea72
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ MsSecurePartitionMain (
NotificationServiceInit ();
#ifdef TPM2_ENABLE
TpmServiceInit ();
#error "TPM2_ENABLE is defined"
#endif
TestServiceInit ();

Expand Down
2 changes: 1 addition & 1 deletion Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -1456,7 +1456,7 @@
Tpm2DebugLib|SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibVerbose.inf
TimerLib|ArmPkg/Library/ArmArchTimerLibEx/ArmArchTimerLibEx.inf
!if $(TPM2_ENABLE) == TRUE
TpmServiceLib|ArmPkg/Library/TpmServiceLib/TpmServiceLib.inf
NULL|ArmPkg/Library/TpmServiceLib/TpmServiceLib.inf
!endif
<PcdsFixedAtBuild>
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x60030000
Expand Down

0 comments on commit 218ea72

Please sign in to comment.