diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-10 16:56:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-10 16:56:59 -0400 |
| commit | 59e84da0b88e4465f15d196bba59f22c906fa50d (patch) | |
| tree | ba62f7bab206bd44dfd516c5689b7d87ab2b064f /lib/efi_loader/efi_esrt.c | |
| parent | 3f2e3c7845df11ca8359a6cc804bfd6eb5ce215b (diff) | |
| parent | f8cd72d1ac6aac8cfa48777b5c0681ee2f9e3671 (diff) | |
Merge tag 'efi-2021-07-rc1' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2021-07-rc1
Bug fixes:
* support EFI, HOST, VIRTIO in fsinfo command
* simplify efi_get_device_path_text()
* add missing EFI_UNACCEPTED_MEMORY_TYPE
* mkeficapsule: improve online help
* avoid several build warnings
Documentation:
* UEFI documentation for initrd loading options
* describe building OP-TEE with for UEFI variables
* mmc man-page
Diffstat (limited to 'lib/efi_loader/efi_esrt.c')
| -rw-r--r-- | lib/efi_loader/efi_esrt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/efi_loader/efi_esrt.c b/lib/efi_loader/efi_esrt.c index 947bdb5e95f..40f53260e4d 100644 --- a/lib/efi_loader/efi_esrt.c +++ b/lib/efi_loader/efi_esrt.c @@ -120,8 +120,8 @@ efi_status_t efi_esrt_allocate_install(u32 num_entries) (void **)&new_esrt); if (ret != EFI_SUCCESS) { - EFI_PRINT("ESRT cannot allocate memory for %d entries (%d bytes)\n", - num_entries, efi_esrt_entries_to_size(num_entries)); + EFI_PRINT("ESRT cannot allocate memory for %u entries (%u bytes)\n", + num_entries, size); return ret; } @@ -180,7 +180,7 @@ struct efi_system_resource_entry *esrt_find_entry(efi_guid_t *img_fw_class) /* Check if the image with img_fw_class is already in the ESRT. */ for (u32 idx = 0; idx < filled_entries; idx++) { if (!guidcmp(&entry[idx].fw_class, img_fw_class)) { - EFI_PRINT("ESRT found entry for image %pUl at index %d\n", + EFI_PRINT("ESRT found entry for image %pUl at index %u\n", img_fw_class, idx); return &entry[idx]; } @@ -202,7 +202,7 @@ struct efi_system_resource_entry *esrt_find_entry(efi_guid_t *img_fw_class) */ esrt->fw_resource_count++; entry[filled_entries].fw_class = *img_fw_class; - EFI_PRINT("ESRT allocated new entry for image %pUl at index %d\n", + EFI_PRINT("ESRT allocated new entry for image %pUl at index %u\n", img_fw_class, filled_entries); return &entry[filled_entries]; @@ -316,7 +316,7 @@ efi_status_t efi_esrt_populate(void) { efi_handle_t *base_handle = NULL; efi_handle_t *it_handle; - size_t no_handles = 0; + efi_uintn_t no_handles = 0; struct efi_firmware_management_protocol *fmp; efi_status_t ret; u32 num_entries = 0; @@ -341,7 +341,7 @@ efi_status_t efi_esrt_populate(void) return EFI_SUCCESS; } - EFI_PRINT("ESRT populate esrt from (%ld) available FMP handles\n", + EFI_PRINT("ESRT populate esrt from (%zd) available FMP handles\n", no_handles); /* @@ -363,7 +363,7 @@ efi_status_t efi_esrt_populate(void) &handler); if (ret != EFI_SUCCESS) { - EFI_PRINT("ESRT Unable to find FMP handle (%d)\n", + EFI_PRINT("ESRT Unable to find FMP handle (%u)\n", idx); goto out; } @@ -414,7 +414,7 @@ efi_status_t efi_esrt_populate(void) EFI_CALL(efi_free_pool(img_info)); } - EFI_PRINT("ESRT create table with %d entries\n", num_entries); + EFI_PRINT("ESRT create table with %u entries\n", num_entries); /* * Allocate an ESRT with the sufficient number of entries to accommodate * all the FMPs in the system. @@ -435,7 +435,7 @@ efi_status_t efi_esrt_populate(void) &handler)); if (ret != EFI_SUCCESS) { - EFI_PRINT("ESRT unable to find FMP handle (%d)\n", + EFI_PRINT("ESRT unable to find FMP handle (%u)\n", idx); break; } |