diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-05 18:13:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-05 18:13:12 -0400 |
| commit | 621e09cb3bf7e6d4fce9dd5e6de97e057adebc3a (patch) | |
| tree | c2fcb855263939c0cf2a19d7c192fb9a74679d3b /lib/efi_loader/efi_setup.c | |
| parent | df3d0a3f95dd9109b889c5411204f133451b7a7e (diff) | |
| parent | 93f6201af71d9a0a521c99212e6066778270a357 (diff) | |
Merge tag 'efi-2020-10-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi into next
Pull request for UEFI sub-system for efi-2020-10-rc1
This series comprises error corrections for the UEFI subsystem:
* correct consideration of timestamps for variable authentication
* correct collection of data regions for code authentication
* correct unit tests to test loading dbx
* enable FAT_WRITE as required by the UEFI spec
The boot manager uses log functions instead of printf() and debug().
The UEFI intialization state is exported.
Diffstat (limited to 'lib/efi_loader/efi_setup.c')
| -rw-r--r-- | lib/efi_loader/efi_setup.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index dd0c53fc239..a3b05a4a9b1 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -11,7 +11,7 @@ #define OBJ_LIST_NOT_INITIALIZED 1 -static efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED; +efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED; /* * Allow unaligned memory access. @@ -140,6 +140,10 @@ efi_status_t efi_init_obj_list(void) if (ret != EFI_SUCCESS) goto out; + ret = efi_console_register(); + if (ret != EFI_SUCCESS) + goto out; + #ifdef CONFIG_PARTITIONS ret = efi_disk_register(); if (ret != EFI_SUCCESS) @@ -185,9 +189,6 @@ efi_status_t efi_init_obj_list(void) if (ret != EFI_SUCCESS) goto out; - ret = efi_console_register(); - if (ret != EFI_SUCCESS) - goto out; #if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO) ret = efi_gop_register(); if (ret != EFI_SUCCESS) |