diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2024-03-04 19:59:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2024-03-05 16:28:06 +0100 |
| commit | f6559edc80d3e02f3c551c1f9005a182e331718c (patch) | |
| tree | 42988eb41d59f0adda4cf7e02bc7ca0d63538689 | |
| parent | a7e6cd8e3efa75b5625c1df3b9ae44c76dd51c0d (diff) | |
| download | barebox-f6559edc80d3.tar.gz barebox-f6559edc80d3.tar.xz | |
efi: payload: fix ARM build
So far we only ever built EFI for x86. Prepare building it for ARM by
removing the x86-specific attributes.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20240304190038.3486881-60-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | efi/payload/image.c | 4 | ||||
| -rw-r--r-- | include/efi/types.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/efi/payload/image.c b/efi/payload/image.c index f9706c028e..8e5ad87de2 100644 --- a/efi/payload/image.c +++ b/efi/payload/image.c @@ -217,8 +217,8 @@ static inline void linux_efi_handover(efi_handle_t handle, handover(handle, efi_sys_table, header); } #else -typedef void(*handover_fn)(VOID *image, EFI_SYSTEM_TABLE *table, - struct SetupHeader *setup) __attribute__((regparm(0))); +typedef void(*handover_fn)(void *image, struct efi_system_table *table, + struct linux_kernel_header *setup); static inline void linux_efi_handover(efi_handle_t handle, struct linux_kernel_header *header) diff --git a/include/efi/types.h b/include/efi/types.h index 3d42948d2b..6e13438769 100644 --- a/include/efi/types.h +++ b/include/efi/types.h @@ -33,7 +33,7 @@ typedef guid_t efi_guid_t __aligned(__alignof__(u32)); (c) & 0xff, ((c) >> 8) & 0xff, \ (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }}) -#ifdef CONFIG_EFI_PAYLOAD +#ifdef __x86_64__ #define EFIAPI __attribute__((ms_abi)) #else #define EFIAPI |