diff mbox series

[v2] efi_loader: remove asm/setjmp.h from efi_api.h

Message ID 20210720055702.103758-1-takahiro.akashi@linaro.org
State New
Headers show
Series [v2] efi_loader: remove asm/setjmp.h from efi_api.h | expand

Commit Message

AKASHI Takahiro July 20, 2021, 5:57 a.m. UTC
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>

---
v2:
   move asm/setjmp.h from efi_loader.h to efi_boottime.c
---
 include/efi_api.h             | 4 ----
 include/efi_loader.h          | 1 +
 lib/efi_loader/efi_boottime.c | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

-- 
2.31.0
diff mbox series

Patch

diff --git a/include/efi_api.h b/include/efi_api.h
index 18a1adf02390..e854a8b3a112 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 b81180cfda8b..e6d41cfb359f 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 f6d5ba05e34a..0b98e9181373 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;