diff options
author | Tom Rini <trini@konsulko.com> | 2021-03-20 08:55:18 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-03-20 08:55:18 -0400 |
commit | 1f9c3f13f6ad8595a0fb5ab2cb830583cdc0b60a (patch) | |
tree | 5ca30add717db7f20f70ff53acfb0875df805634 /lib/efi_loader/efi_device_path_to_text.c | |
parent | 65f2e55b578779dcddc94f625762e08b11e4b018 (diff) | |
parent | 76b0a19022e22a5bbb84cd76d516bdb625a70417 (diff) |
Merge tag 'efi-2021-04-rc5-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2021-04-rc5-2
Bug fixes:
* re-enable loading UEFI binaries via UART
* fix a NULL dereference in EFI console
Diffstat (limited to 'lib/efi_loader/efi_device_path_to_text.c')
-rw-r--r-- | lib/efi_loader/efi_device_path_to_text.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c index edc9fdc3870..43554cd771b 100644 --- a/lib/efi_loader/efi_device_path_to_text.c +++ b/lib/efi_loader/efi_device_path_to_text.c @@ -118,6 +118,19 @@ static char *dp_msging(char *s, struct efi_device_path *dp) ide->logical_unit_number); break; } + case DEVICE_PATH_SUB_TYPE_MSG_UART: { + struct efi_device_path_uart *uart = + (struct efi_device_path_uart *)dp; + s += sprintf(s, "Uart(%lld,%d,%d,", uart->baud_rate, + uart->data_bits, uart->parity); + switch (uart->stop_bits) { + case 2: + s += sprintf(s, "1.5)"); + default: + s += sprintf(s, "%d)", uart->stop_bits); + } + break; + } case DEVICE_PATH_SUB_TYPE_MSG_USB: { struct efi_device_path_usb *udp = (struct efi_device_path_usb *)dp; |