diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-26 08:45:08 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-26 08:45:08 -0500 |
| commit | b3820ba997f004a376efc5446683101ff42b05af (patch) | |
| tree | 384943346ded7a82aa22747fbe2010dc9f69ca33 /lib/efi_loader | |
| parent | afd46c5f13d0c93c44008bd7040227d0b84e31b9 (diff) | |
| parent | 00358bb804e9e8aa754f946954d299ba9e658a84 (diff) | |
Merge tag 'efi-2019-04-rc3' of https://github.com/xypron2/u-boot
Pull request for the UEFI sub-system for v2019.04-rc3
A new option -e is added to the env command which allows to display and
change UEFI variables in a user friendly way.
A new command efidebug is introduced to edit the UEFI boot sequence and to
display different aspects of the state of the UEFI sub-system: memory map,
loaded images, handles, drivers and devices.
A bug in the UEFI boot manager is fixed.
Diffstat (limited to 'lib/efi_loader')
| -rw-r--r-- | lib/efi_loader/efi_bootmgr.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index 196116b5472..417016102b4 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -14,10 +14,6 @@ static const struct efi_boot_services *bs; static const struct efi_runtime_services *rs; -#define LOAD_OPTION_ACTIVE 0x00000001 -#define LOAD_OPTION_FORCE_RECONNECT 0x00000002 -#define LOAD_OPTION_HIDDEN 0x00000008 - /* * bootmgr implements the logic of trying to find a payload to boot * based on the BootOrder + BootXXXX variables, and then loading it. @@ -178,14 +174,14 @@ void *efi_bootmgr_load(struct efi_device_path **device_path, void *image = NULL; int i, num; - __efi_entry_check(); - bs = systab.boottime; rs = systab.runtime; bootorder = get_var(L"BootOrder", &efi_global_variable_guid, &size); - if (!bootorder) + if (!bootorder) { + printf("BootOrder not defined\n"); goto error; + } num = size / sizeof(uint16_t); for (i = 0; i < num; i++) { @@ -198,7 +194,5 @@ void *efi_bootmgr_load(struct efi_device_path **device_path, free(bootorder); error: - __efi_exit_check(); - return image; } |