diff options
| author | Tom Rini <[email protected]> | 2022-04-29 14:04:08 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-04-29 14:04:08 -0400 |
| commit | c70c0102af5413cadde6bf90044cb75aefef0584 (patch) | |
| tree | adf1fa2efb653261ce8eb1b8087bd5f28e4aa913 /common | |
| parent | f7bd9e4936b6e36c2443b9b2ef761e7593511521 (diff) | |
| parent | 5e847f7729b3cc34b572b4f59ee7d468b3b76ccc (diff) | |
Merge tag 'efi-2022-07-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-07-rc2
UEFI:
* fix UEFI booting after integration of UEFI sub-system with driver model
* avoid random return values from devpath_is_partition()
* minor code clean ups
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/board_r.c b/common/board_r.c index ff17720cf3f..93c9c2e50da 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 @@ -793,9 +796,6 @@ static init_fnc_t init_sequence_r[] = { #if defined(CONFIG_PRAM) initr_mem, #endif -#ifdef CONFIG_EFI_SETUP_EARLY - efi_init_early, -#endif run_main_loop, }; |