diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-01 10:56:37 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-01 10:56:37 -0500 |
| commit | 41cab8edbcf38bce5cddf54957618dd4205d008f (patch) | |
| tree | efe29a6e552133360d8303fc44b025ecf2cc1b95 /common/board_r.c | |
| parent | 2c31d7e746766f47a007f39c030706e493a9cc77 (diff) | |
| parent | af11423eb06d68784647b879cac57d7b6619d095 (diff) | |
Merge tag 'efi-2020-01-rc2-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2021-01-rc2 (2)
The series contains the following enhancements
* preparatory patches for UEFI capsule updates
* initialization of the emulated RTC using an environment variable
and a bug fix
* If DisconnectController() is called for a child controller that is the
only child of the driver, the driver must be disconnected.
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common/board_r.c b/common/board_r.c index 0829622d0d..29dd7d26d9 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -73,6 +73,9 @@ #if defined(CONFIG_GPIO_HOG) #include <asm/gpio.h> #endif +#ifdef CONFIG_EFI_SETUP_EARLY +#include <efi_loader.h> +#endif DECLARE_GLOBAL_DATA_PTR; @@ -889,6 +892,9 @@ static init_fnc_t init_sequence_r[] = { #if defined(CONFIG_PRAM) initr_mem, #endif +#ifdef CONFIG_EFI_SETUP_EARLY + (init_fnc_t)efi_init_obj_list, +#endif run_main_loop, }; |