efi_loader: variable: fix secure state initialization

[platform/kernel/u-boot.git] / lib / efi_loader / efi_variable.c

diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index 282d542..a10b9ca 100644 (file)
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -508,10 +508,6 @@ efi_status_t efi_init_variables(void)
        if (ret != EFI_SUCCESS)
                return ret;
 
-       ret = efi_init_secure_state();
-       if (ret != EFI_SUCCESS)
-               return ret;
-
        if (IS_ENABLED(CONFIG_EFI_VARIABLES_PRESEED)) {
                ret = efi_var_restore((struct efi_var_file *)
                                      __efi_var_file_begin);
@@ -519,5 +515,9 @@ efi_status_t efi_init_variables(void)
                        log_err("Invalid EFI variable seed\n");
        }
 
-       return efi_var_from_file();
+       ret = efi_var_from_file();
+       if (ret != EFI_SUCCESS)
+               return ret;
+
+       return efi_init_secure_state();
 }