diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2019-02-09 14:10:39 +0100 |
|---|---|---|
| committer | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2019-02-16 15:42:20 +0100 |
| commit | 914df75b0c97b6e9774025500c061231db1cc6b4 (patch) | |
| tree | d3448f0a06f50f20a92624c57ae8c52a50a24daf | |
| parent | f69d63fae281ba98c3d063097cf4e95d17f3754d (diff) | |
efi_loader: fix EFI entry counting
`bootefi selftest` fails on qemu-x86_defconfig if efi_selftest() is not
invoked using EFI_CALL().
Likewise we call the entry point of EFI payloads with
EFI_CALL(efi_start_image()).
entry_count indicates if we are in U-Boot (1) or in EFI payload code (0).
As we start in U-Boot code the initial value has to be 1.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| -rw-r--r-- | cmd/bootefi.c | 2 | ||||
| -rw-r--r-- | lib/efi_loader/efi_boottime.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index a2d38256e9..e1eba463b8 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -437,7 +437,7 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return CMD_RET_FAILURE; /* Execute the test */ - r = efi_selftest(&image_obj->header, &systab); + r = EFI_CALL(efi_selftest(&image_obj->header, &systab)); bootefi_run_finish(image_obj, loaded_image_info); return r != EFI_SUCCESS; } else diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 45ed36755f..bd8b8a17ae 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -44,7 +44,8 @@ static bool efi_is_direct_boot = true; static volatile void *efi_gd, *app_gd; #endif -static int entry_count; +/* 1 if inside U-Boot code, 0 if inside EFI payload code */ +static int entry_count = 1; static int nesting_level; /* GUID of the device tree table */ const efi_guid_t efi_guid_fdt = EFI_FDT_GUID; |