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

efi_loader: remove CONFIG_EFI_SETUP_EARLY

Browse Source 
Since the commit a9bf024b29 ("efi_loader: disk: a helper function to
create efi_disk objects from udevice"), CONFIG_EFI_SETUP_EARLY option is
by default on and will never be turned off.

So just remove this option.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
AKASHI Takahiro 2022-10-21 12:01:57 +09:00 committed by Heinrich Schuchardt
parent 77b5c4a5b1
commit 023d9c9393
3 changed files with 12 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/board_r.c
View File

@ -694,7 +694,7 @@ static init_fnc_t init_sequence_r[] = {
/* initialize higher level parts of CPU like time base and timers */
cpu_init_r,
#endif
#ifdef CONFIG_EFI_SETUP_EARLY
#ifdef CONFIG_EFI_LOADER
efi_init_early,
#endif
#ifdef CONFIG_CMD_NAND

5
lib/efi_loader/Kconfig
View File

@ -41,10 +41,6 @@ config CMD_BOOTEFI_BOOTMGR
via UEFI variables Boot####, BootOrder, and BootNext. This enables the
'bootefi bootmgr' command.
config EFI_SETUP_EARLY
bool
default y
choice
prompt "Store for non-volatile UEFI variables"
default EFI_VARIABLE_FILE_STORE
@ -160,7 +156,6 @@ config EFI_IGNORE_OSINDICATIONS
config EFI_CAPSULE_ON_DISK_EARLY
bool "Initiate capsule-on-disk at U-Boot boottime"
depends on EFI_CAPSULE_ON_DISK
select EFI_SETUP_EARLY
help
Normally, without this option enabled, capsules will be
executed only at the first time of invoking one of efi command.

43
lib/efi_loader/efi_setup.c
View File

@ -175,16 +175,15 @@ static efi_status_t efi_init_os_indications(void)
}
/**
* __efi_init_early() - handle initialization at early stage
* efi_init_early() - handle initialization at early stage
*
* This function is called in efi_init_obj_list() only if
* !CONFIG_EFI_SETUP_EARLY.
* expected to be called in board_init_r().
*
* Return: status code
*/
static efi_status_t __efi_init_early(void)
int efi_init_early(void)
{
efi_status_t ret = EFI_SUCCESS;
efi_status_t ret;
/* Allow unaligned memory access */
allow_unaligned();
@ -200,29 +199,15 @@ static efi_status_t __efi_init_early(void)
/* Initialize EFI driver uclass */
ret = efi_driver_init();
out:
return ret;
}
if (ret != EFI_SUCCESS)
goto out;
/**
* efi_init_early() - handle initialization at early stage
*
* external version of __efi_init_early(); expected to be called in
* board_init_r().
*
* Return: status code
*/
int efi_init_early(void)
{
efi_status_t ret;
ret = __efi_init_early();
if (ret != EFI_SUCCESS) {
/* never re-init UEFI subsystem */
efi_obj_list_initialized = ret;
return -1;
}
return 0;
out:
/* never re-init UEFI subsystem */
efi_obj_list_initialized = ret;
return -1;
}
/**
@ -238,12 +223,6 @@ efi_status_t efi_init_obj_list(void)
if (efi_obj_list_initialized != OBJ_LIST_NOT_INITIALIZED)
return efi_obj_list_initialized;
if (!IS_ENABLED(CONFIG_EFI_SETUP_EARLY)) {
ret = __efi_init_early();
if (ret != EFI_SUCCESS)
goto out;
}
/* Set up console modes */
efi_setup_console_size();