diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-31 13:05:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-31 13:05:57 -0400 |
| commit | 43d3de544d123b9609b637e614c8e2872f1153fc (patch) | |
| tree | 66ee7181f975b4e7821047b4d682465d0d369f95 | |
| parent | 1ba21bb06b08d2f5d62afac29549ade8616929ce (diff) | |
| parent | d084f20233b1ca1fe1330e1aedb614b2a0c59abf (diff) | |
| download | u-boot-43d3de544d123b9609b637e614c8e2872f1153fc.tar.gz u-boot-43d3de544d123b9609b637e614c8e2872f1153fc.tar.xz u-boot-43d3de544d123b9609b637e614c8e2872f1153fc.zip | |
Merge tag 'efi-2021-04-rc6' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2021-04-rc6
Bug fix:
Fix ConvertDeviceNodeToText() for Uart()
| -rw-r--r-- | lib/efi_loader/efi_device_path_to_text.c | 2 | ||||
| -rw-r--r-- | lib/efi_loader/helloworld.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c index 43554cd771..675e80bcb8 100644 --- a/lib/efi_loader/efi_device_path_to_text.c +++ b/lib/efi_loader/efi_device_path_to_text.c @@ -126,8 +126,10 @@ static char *dp_msging(char *s, struct efi_device_path *dp) switch (uart->stop_bits) { case 2: s += sprintf(s, "1.5)"); + break; default: s += sprintf(s, "%d)", uart->stop_bits); + break; } break; } diff --git a/lib/efi_loader/helloworld.c b/lib/efi_loader/helloworld.c index 5c8b7a96f9..3f215e2a46 100644 --- a/lib/efi_loader/helloworld.c +++ b/lib/efi_loader/helloworld.c @@ -181,7 +181,7 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle, (void **)&device_path); if (ret != EFI_SUCCESS) { con_out->output_string - (con_out, L"Missing devide path for device handle\r\n"); + (con_out, L"Missing device path for device handle\r\n"); goto out; } con_out->output_string(con_out, L"Boot device: "); |