colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

efi_loader: remove ERROR:, WARNING: prefixes in messages

Browse Source 
We should not write "ERROR:" or "WARNING:" when using log_err() or
log_warning(). These prefixed don't provide additional information.

Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt
2024-10-17 20:13:05 +02:00
parent 640427c6ae
commit 76a692a2ca
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/efi_loader/efi_helper.c
View File

@@ -412,7 +412,7 @@ static efi_status_t copy_fdt(void **fdtp)
EFI_ACPI_RECLAIM_MEMORY, fdt_pages, EFI_ACPI_RECLAIM_MEMORY, fdt_pages,
&new_fdt_addr); &new_fdt_addr);
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
log_err("ERROR: Failed to reserve space for FDT\n"); log_err("Failed to reserve space for FDT\n");
goto done; goto done;
} }
new_fdt = (void *)(uintptr_t)new_fdt_addr; new_fdt = (void *)(uintptr_t)new_fdt_addr;
@@ -468,7 +468,7 @@ efi_status_t efi_install_fdt(void *fdt)
* but not both. * but not both.
*/ */
if (CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE) && fdt) if (CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE) && fdt)
log_warning("WARNING: Can't have ACPI table and device tree - ignoring DT.\n"); log_warning("Can't have ACPI table and device tree - ignoring DT.\n");
if (fdt == EFI_FDT_USE_INTERNAL) { if (fdt == EFI_FDT_USE_INTERNAL) {
const char *fdt_opt; const char *fdt_opt;
@@ -483,13 +483,13 @@ efi_status_t efi_install_fdt(void *fdt)
if (!fdt_opt) { if (!fdt_opt) {
fdt_opt = env_get("fdtcontroladdr"); fdt_opt = env_get("fdtcontroladdr");
if (!fdt_opt) { if (!fdt_opt) {
log_err("ERROR: need device tree\n"); log_err("need device tree\n");
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
} }
fdt_addr = hextoul(fdt_opt, NULL); fdt_addr = hextoul(fdt_opt, NULL);
if (!fdt_addr) { if (!fdt_addr) {
log_err("ERROR: invalid $fdt_addr or $fdtcontroladdr\n"); log_err("invalid $fdt_addr or $fdtcontroladdr\n");
return EFI_LOAD_ERROR; return EFI_LOAD_ERROR;
} }
fdt = map_sysmem(fdt_addr, 0); fdt = map_sysmem(fdt_addr, 0);
@@ -497,7 +497,7 @@ efi_status_t efi_install_fdt(void *fdt)
/* Install device tree */ /* Install device tree */
if (fdt_check_header(fdt)) { if (fdt_check_header(fdt)) {
log_err("ERROR: invalid device tree\n"); log_err("invalid device tree\n");
return EFI_LOAD_ERROR; return EFI_LOAD_ERROR;
} }
@@ -510,12 +510,12 @@ efi_status_t efi_install_fdt(void *fdt)
/* Prepare device tree for payload */ /* Prepare device tree for payload */
ret = copy_fdt(&fdt); ret = copy_fdt(&fdt);
if (ret) { if (ret) {
log_err("ERROR: out of memory\n"); log_err("out of memory\n");
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
if (image_setup_libfdt(&img, fdt, false)) { if (image_setup_libfdt(&img, fdt, false)) {
log_err("ERROR: failed to process device tree\n"); log_err("failed to process device tree\n");
return EFI_LOAD_ERROR; return EFI_LOAD_ERROR;
} }
@@ -527,7 +527,7 @@ efi_status_t efi_install_fdt(void *fdt)
if (CONFIG_IS_ENABLED(EFI_TCG2_PROTOCOL_MEASURE_DTB)) { if (CONFIG_IS_ENABLED(EFI_TCG2_PROTOCOL_MEASURE_DTB)) {
ret = efi_tcg2_measure_dtb(fdt); ret = efi_tcg2_measure_dtb(fdt);
if (ret == EFI_SECURITY_VIOLATION) { if (ret == EFI_SECURITY_VIOLATION) {
log_err("ERROR: failed to measure DTB\n"); log_err("failed to measure DTB\n");
return ret; return ret;
} }
} }
@@ -535,7 +535,7 @@ efi_status_t efi_install_fdt(void *fdt)
/* Install device tree as UEFI table */ /* Install device tree as UEFI table */
ret = efi_install_configuration_table(&efi_guid_fdt, fdt); ret = efi_install_configuration_table(&efi_guid_fdt, fdt);
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
log_err("ERROR: failed to install device tree\n"); log_err("failed to install device tree\n");
return ret; return ret;
} }
@@ -574,7 +574,7 @@ efi_status_t do_bootefi_exec(efi_handle_t handle, void *load_options)
*/ */
ret = efi_set_watchdog(300); ret = efi_set_watchdog(300);
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
log_err("ERROR: Failed to set watchdog timer\n"); log_err("failed to set watchdog timer\n");
goto out; goto out;
} }