Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi_loader: remove asm/setjmp.h from efi_api.h

Browse source 
In the commit c982874e93 ("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: c982874e93 ("efi_loader: refactor efi_setup_loaded_image()")
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
AKASHI Takahiro 2021-07-20 14:57:02 +09:00 • committed by Heinrich Schuchardt
parent c2cc60c1f9
commit 86a3d43bff
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/efi_api.h
View file

@ -20,10 +20,6 @@
#include <charset.h> #include <charset.h>
#include <pe.h> #include <pe.h>
#ifdef CONFIG_EFI_LOADER
#include <asm/setjmp.h>
#endif
/* UEFI spec version 2.8 */ /* UEFI spec version 2.8 */
#define EFI_SPECIFICATION_VERSION (2 << 16 | 80) #define EFI_SPECIFICATION_VERSION (2 << 16 | 80)

1
include/efi_loader.h
View file

@ -17,6 +17,7 @@
#include <pe.h> #include <pe.h>
struct blk_desc; struct blk_desc;
struct jmp_buf_data;
static inline int guidcmp(const void *g1, const void *g2) static inline int guidcmp(const void *g1, const void *g2)
{ {

1
lib/efi_loader/efi_boottime.c
View file

@ -20,6 +20,7 @@
#include <usb.h> #include <usb.h>
#include <watchdog.h> #include <watchdog.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <asm/setjmp.h>
#include <linux/libfdt_env.h> #include <linux/libfdt_env.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;