Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OvmfPkg/Tcg2ConfigPei: trivial cleanups [push] #670

Merged
merged 2 commits into from
Jun 9, 2020

Conversation

lersek
Copy link
Member

@lersek lersek commented Jun 9, 2020

https://bugzilla.tianocore.org/show_bug.cgi?id=2752
http://mid.mail-archive.com/20200603170413.23936-1-lersek@redhat.com
https://edk2.groups.io/g/devel/message/60690

Ref:    https://bugzilla.tianocore.org/show_bug.cgi?id=2752
Repo:   https://pagure.io/lersek/edk2.git
Branch: tcg_config_pei_trivial

Two trivial cleanups after commit 89236992913f ("OvmfPkg: detect TPM 1.2
in Tcg2ConfigPei", 2020-03-04) and commit 74f90d38c446
("OvmfPkg/Tcg2ConfigPei: skip TPM-1.2 detection when building for
ARM/AARCH64", 2020-05-21), respectively.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Stefan Berger <stefanb@linux.ibm.com>

Thanks
Laszlo

Laszlo Ersek (2):
  OvmfPkg/Tcg2ConfigPei: generalize TPM2-only file-top comments
  OvmfPkg/Tcg2ConfigPei: restrict BaseLib class dependency to IA32 and
    X64

 OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 4 ++--
 OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

The leading comments in "Tcg2ConfigPei.inf" and "Tcg2ConfigPeim.c" say,
"In OvmfPkg, the module only performs TPM2 hardware detection".

The statement hasn't been correct since commit 8923699 ("OvmfPkg:
detect TPM 1.2 in Tcg2ConfigPei", 2020-03-04). Replace "TPM2" with "TPM"
(without stating a version) in those file-top comments.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Stefan Berger <stefanb@linux.ibm.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2752
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20200603170413.23936-2-lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
BaseLib interfaces (namely, SwapBytesXx()) are only used in
"Tpm12Support.c", which is IA32/X64-only. Therefore the BaseLib class
dependency should also be restricted to IA32 & X64, in the INF file.

The "#include <Library/BaseLib.h>" directive is already present in
"Tpm12Support.c" only.

(The BaseLib dependency should have been restricted to IA32 and X64
together with the Tpm12DeviceLib dependency, as part of commit
74f90d3, "OvmfPkg/Tcg2ConfigPei: skip TPM-1.2 detection when building
for ARM/AARCH64", 2020-05-21.)

This is a trivial cleanup; functionally a no-op.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Stefan Berger <stefanb@linux.ibm.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2752
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20200603170413.23936-3-lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
@lersek lersek added the push Auto push patch series in PR if all checks pass label Jun 9, 2020
@mergify mergify bot merged commit 82e0b2f into tianocore:master Jun 9, 2020
@lersek lersek deleted the tcg_config_pei_trivial_push branch June 9, 2020 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
push Auto push patch series in PR if all checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant