efi: Allow memory messages to be optional
Add a 'verbose' argument to setup_memory() so that the memory messages can be suppressed if desired. For now, keep them as they are. Signed-off-by: Simon Glass <simon.glass@canonical.com>
This commit is contained in:
@@ -90,7 +90,7 @@ int efi_get_mmap(struct efi_mem_desc **descp, int *sizep, uint *keyp,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static efi_status_t setup_memory(struct efi_priv *priv)
|
static efi_status_t setup_memory(struct efi_priv *priv, bool verbose)
|
||||||
{
|
{
|
||||||
struct efi_boot_services *boot = priv->boot;
|
struct efi_boot_services *boot = priv->boot;
|
||||||
struct global_data *ptr;
|
struct global_data *ptr;
|
||||||
@@ -119,19 +119,23 @@ static efi_status_t setup_memory(struct efi_priv *priv)
|
|||||||
ret = boot->allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
|
ret = boot->allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
|
||||||
priv->image_data_type, pages, &addr);
|
priv->image_data_type, pages, &addr);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
log_info("(any address) ");
|
if (verbose)
|
||||||
|
log_info("(any address) ");
|
||||||
ret = boot->allocate_pages(EFI_ALLOCATE_ANY_PAGES,
|
ret = boot->allocate_pages(EFI_ALLOCATE_ANY_PAGES,
|
||||||
priv->image_data_type, pages, &addr);
|
priv->image_data_type, pages, &addr);
|
||||||
}
|
}
|
||||||
if (ret) {
|
if (ret) {
|
||||||
log_info("(using pool %lx) ", ret);
|
if (verbose)
|
||||||
|
log_info("(using pool %lx) ", ret);
|
||||||
priv->ram_base = (ulong)efi_malloc(priv, CONFIG_EFI_RAM_SIZE,
|
priv->ram_base = (ulong)efi_malloc(priv, CONFIG_EFI_RAM_SIZE,
|
||||||
&ret);
|
&ret);
|
||||||
if (!priv->ram_base)
|
if (!priv->ram_base)
|
||||||
return ret;
|
return ret;
|
||||||
priv->use_pool_for_malloc = true;
|
priv->use_pool_for_malloc = true;
|
||||||
} else {
|
} else {
|
||||||
log_info("(using allocated RAM address %lx) ", (ulong)addr);
|
if (verbose)
|
||||||
|
log_info("(using allocated RAM address %lx) ",
|
||||||
|
(ulong)addr);
|
||||||
priv->ram_base = addr;
|
priv->ram_base = addr;
|
||||||
}
|
}
|
||||||
gd->ram_base = addr;
|
gd->ram_base = addr;
|
||||||
@@ -443,7 +447,7 @@ efi_status_t efi_startup(efi_handle_t image, struct efi_system_table *systab)
|
|||||||
*/
|
*/
|
||||||
debug_uart_init();
|
debug_uart_init();
|
||||||
|
|
||||||
ret = setup_memory(priv);
|
ret = setup_memory(priv, true);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
printf("Failed to set up memory: ret=%lx\n", ret);
|
printf("Failed to set up memory: ret=%lx\n", ret);
|
||||||
return ret;
|
return ret;
|
||||||
|
|||||||
Reference in New Issue
Block a user