| Message ID | 20230213101759.2577077-26-nikos.nikoleris@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | EFI and ACPI support for arm64 | expand |
Hi Nikos, On 2/13/23 18:17, Nikos Nikoleris wrote: > Convert some types to avoid dependency on gnu-efi's <efi.h> and > <efilib.h>. > > Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com> > --- > arm/efi/reloc_aarch64.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/arm/efi/reloc_aarch64.c b/arm/efi/reloc_aarch64.c > index 08672796..fa0cd6bc 100644 > --- a/arm/efi/reloc_aarch64.c > +++ b/arm/efi/reloc_aarch64.c > @@ -34,14 +34,11 @@ > SUCH DAMAGE. > */ > > -#include <efi.h> > -#include <efilib.h> > - > +#include "efi.h" In [PATCH v4 27/30] lib: Avoid external dependency in libelf. The Include header file changed again. So why not move this change early? diff --git a/arm/efi/reloc_aarch64.c b/arm/efi/reloc_aarch64.c index fa0cd6bc..3f6d9a6d 100644 --- a/arm/efi/reloc_aarch64.c +++ b/arm/efi/reloc_aarch64.c @@ -34,8 +34,7 @@ SUCH DAMAGE. */ -#include "efi.h" -#include <elf.h> +#include <efi.h> Thanks, Shaoqin > #include <elf.h> > > -EFI_STATUS _relocate (long ldbase, Elf64_Dyn *dyn, > - EFI_HANDLE image EFI_UNUSED, > - EFI_SYSTEM_TABLE *systab EFI_UNUSED) > +efi_status_t _relocate(long ldbase, Elf64_Dyn *dyn, efi_handle_t image, > + efi_system_table_t *sys_tab) > { > long relsz = 0, relent = 0; > Elf64_Rela *rel = 0;
diff --git a/arm/efi/reloc_aarch64.c b/arm/efi/reloc_aarch64.c index 08672796..fa0cd6bc 100644 --- a/arm/efi/reloc_aarch64.c +++ b/arm/efi/reloc_aarch64.c @@ -34,14 +34,11 @@ SUCH DAMAGE. */ -#include <efi.h> -#include <efilib.h> - +#include "efi.h" #include <elf.h> -EFI_STATUS _relocate (long ldbase, Elf64_Dyn *dyn, - EFI_HANDLE image EFI_UNUSED, - EFI_SYSTEM_TABLE *systab EFI_UNUSED) +efi_status_t _relocate(long ldbase, Elf64_Dyn *dyn, efi_handle_t image, + efi_system_table_t *sys_tab) { long relsz = 0, relent = 0; Elf64_Rela *rel = 0;
Convert some types to avoid dependency on gnu-efi's <efi.h> and <efilib.h>. Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com> --- arm/efi/reloc_aarch64.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)