diff options
| author | AKASHI Takahiro <takahiro.akashi@linaro.org> | 2021-07-20 14:57:02 +0900 |
|---|---|---|
| committer | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2021-07-24 10:49:51 +0200 |
| commit | 86a3d43bff414f30089b1b9a7b01234aca58763d (patch) | |
| tree | 1bafc463c539f8e94d8c0a36793707883037ddad | |
| parent | c2cc60c1f93b9935c493fbe107ef8111e8baf200 (diff) | |
| download | u-boot-86a3d43bff414f30089b1b9a7b01234aca58763d.tar.gz | |
efi_loader: remove asm/setjmp.h from efi_api.h
In the commit c982874e930d ("efi_loader: refactor
efi_setup_loaded_image()"), setjmp-related definitions were moved to
efi_loaded_image_obj in efi_loader.h. So setjmp.h is no longer
refererenced in efi_api.h.
This also fixes some error when efi_api.h will be included in
mkeficapsule.c.
Fixes: c982874e930d ("efi_loader: refactor efi_setup_loaded_image()")
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| -rw-r--r-- | include/efi_api.h | 4 | ||||
| -rw-r--r-- | include/efi_loader.h | 1 | ||||
| -rw-r--r-- | lib/efi_loader/efi_boottime.c | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/include/efi_api.h b/include/efi_api.h index 18a1adf023..e854a8b3a1 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -20,10 +20,6 @@ #include <charset.h> #include <pe.h> -#ifdef CONFIG_EFI_LOADER -#include <asm/setjmp.h> -#endif - /* UEFI spec version 2.8 */ #define EFI_SPECIFICATION_VERSION (2 << 16 | 80) diff --git a/include/efi_loader.h b/include/efi_loader.h index b81180cfda..e6d41cfb35 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -17,6 +17,7 @@ #include <pe.h> struct blk_desc; +struct jmp_buf_data; static inline int guidcmp(const void *g1, const void *g2) { diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index f6d5ba05e3..0b98e91813 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -20,6 +20,7 @@ #include <usb.h> #include <watchdog.h> #include <asm/global_data.h> +#include <asm/setjmp.h> #include <linux/libfdt_env.h> DECLARE_GLOBAL_DATA_PTR; |