diff options
| author | Tom Rini <[email protected]> | 2020-11-09 15:48:50 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-11-09 15:48:50 -0500 |
| commit | b3f48734384aab649422d789447aa8a12d4eb716 (patch) | |
| tree | b91282bbc88ad9f8e4272608077500fd61b447bf /cmd | |
| parent | 74f11b55df961170223d22e0daea13b095013514 (diff) | |
| parent | a322f54f50cfb2e8e7a68968c060b2fd3dbd934d (diff) | |
Merge tag 'efi-2021-01-rc2-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2021-01-rc2 (2)
The following bugs are fixed:
* The conitrace command failed to build.
* Non-volatile UEFI variables were not delete form the file store.
The following features are added:
* Support for the FN1 - FN10 keys on crosswire keyboards is added.
* An EFI binary is provided to dump the binary device tree.
tpm2_get_capability() is adjusted in preparation of the implementation
of the EFI_TCG2_PROTOCOL.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/conitrace.c | 4 | ||||
| -rw-r--r-- | cmd/tpm-v2.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/conitrace.c b/cmd/conitrace.c index 88850db541f..811f5c68a9c 100644 --- a/cmd/conitrace.c +++ b/cmd/conitrace.c @@ -19,10 +19,10 @@ static int do_conitrace(struct cmd_tbl *cmdtp, int flag, int argc, /* Empty input buffer */ while (tstc()) - getc(); + getchar(); for (;;) { - int c = getc(); + int c = getchar(); if (first && (c == 'x' || c == 'X')) break; diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c index e6742656f57..5fa4788a72d 100644 --- a/cmd/tpm-v2.c +++ b/cmd/tpm-v2.c @@ -191,10 +191,10 @@ static int do_tpm_get_capability(struct cmd_tbl *cmdtp, int flag, int argc, for (i = 0; i < count; i++) { printf("Property 0x"); for (j = 0; j < 4; j++) - printf("%02x", data[(i * 8) + j]); + printf("%02x", data[(i * 8) + j + sizeof(u32)]); printf(": 0x"); for (j = 4; j < 8; j++) - printf("%02x", data[(i * 8) + j]); + printf("%02x", data[(i * 8) + j + sizeof(u32)]); printf("\n"); } |