| Message ID | 20200609050947.17861-2-takahiro.akashi@linaro.org |
|---|---|
| State | Accepted, archived |
| Commit | f7a963c6af5a077631a4ff43fcd10533969b14b2 |
| Delegated to: | Heinrich Schuchardt |
| Headers | show |
| Series | efi_loader: rework/improve UEFI secure boot code | expand |
On 09.06.20 07:09, AKASHI Takahiro wrote: > The simplest solution to revert the commit b32ac16f9a32 ("test/py: fix > test_efi_secboot/conftest.py") is to move efi_console_register() > forward before efi_disk_register(). > > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index dd0c53fc2399..671f6da12b30 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -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)
The simplest solution to revert the commit b32ac16f9a32 ("test/py: fix test_efi_secboot/conftest.py") is to move efi_console_register() forward before efi_disk_register(). Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> --- lib/efi_loader/efi_setup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)