efi_loader: remove CONFIG_EFI_SETUP_EARLY
Since the commit a9bf024b2933 ("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>
diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
index 68e6c25..e2b6438 100644
--- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig
@@ -41,10 +41,6 @@
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_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.
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index e40f64f..5437641 100644
--- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c
@@ -175,16 +175,15 @@
}
/**
- * __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 @@
/* Initialize EFI driver uclass */
ret = efi_driver_init();
-out:
- return ret;
-}
-
-/**
- * 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;
+ if (ret != EFI_SUCCESS)
+ goto out;
- 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 @@
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();