From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Date: Thu, 28 Apr 2022 06:30:30 +0000 (+0000)
Subject: efi_loader: call efi_init_early() earlier
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=5e847f7729b3cc34b572b4f59ee7d468b3b76ccc;p=u-boot.git

efi_loader: call efi_init_early() earlier

efi_init_early() creates an event hook for block device probing.
It has to be called before any block device is probed.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---

diff --git a/common/board_r.c b/common/board_r.c
index ff17720cf3..93c9c2e50d 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -693,6 +693,9 @@ 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
+	efi_init_early,
+#endif
 #ifdef CONFIG_CMD_NAND
 	initr_nand,
 #endif
@@ -792,9 +795,6 @@ static init_fnc_t init_sequence_r[] = {
 #endif
 #if defined(CONFIG_PRAM)
 	initr_mem,
-#endif
-#ifdef CONFIG_EFI_SETUP_EARLY
-	efi_init_early,
 #endif
 	run_main_loop,
 };