Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 07:31:15 +00:00
Code Issues Projects Releases Packages 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 */ /* initialize higher level parts of CPU like time base and timers */
cpu_init_r, cpu_init_r,
#endif #endif
#ifdef CONFIG_EFI_SETUP_EARLY #ifdef CONFIG_EFI_LOADER
efi_init_early, efi_init_early,
#endif #endif
#ifdef CONFIG_CMD_NAND #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 via UEFI variables Boot####, BootOrder, and BootNext. This enables the
'bootefi bootmgr' command. 'bootefi bootmgr' command.
config EFI_SETUP_EARLY
bool
default y
choice choice
prompt "Store for non-volatile UEFI variables" prompt "Store for non-volatile UEFI variables"
default EFI_VARIABLE_FILE_STORE default EFI_VARIABLE_FILE_STORE
@ -160,7 +156,6 @@ config EFI_IGNORE_OSINDICATIONS
config EFI_CAPSULE_ON_DISK_EARLY config EFI_CAPSULE_ON_DISK_EARLY
bool "Initiate capsule-on-disk at U-Boot boottime" bool "Initiate capsule-on-disk at U-Boot boottime"
depends on EFI_CAPSULE_ON_DISK depends on EFI_CAPSULE_ON_DISK
select EFI_SETUP_EARLY
help help
Normally, without this option enabled, capsules will be Normally, without this option enabled, capsules will be
executed only at the first time of invoking one of efi command. 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 * expected to be called in board_init_r().
* !CONFIG_EFI_SETUP_EARLY.
* *
* Return: status code * 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 memory access */
allow_unaligned(); allow_unaligned();
@ -200,29 +199,15 @@ static efi_status_t __efi_init_early(void)
/* Initialize EFI driver uclass */ /* Initialize EFI driver uclass */
ret = efi_driver_init(); ret = efi_driver_init();
out: if (ret != EFI_SUCCESS)
return ret; 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; 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) if (efi_obj_list_initialized != OBJ_LIST_NOT_INITIALIZED)
return efi_obj_list_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 */ /* Set up console modes */
efi_setup_console_size(); efi_setup_console_size();