diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2018-05-18 19:12:19 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2018-06-03 15:27:20 +0200 |
| commit | 508d8567046fe3c0d1354fc3a7a6f81d9661a661 (patch) | |
| tree | 282def10a0e21e4cc02ccc8a50e27740d6c0fd55 | |
| parent | a4aa7bef3c66e473ab4671b0edef1bb66488a032 (diff) | |
| download | u-boot-508d8567046fe3c0d1354fc3a7a6f81d9661a661.tar.gz u-boot-508d8567046fe3c0d1354fc3a7a6f81d9661a661.tar.xz u-boot-508d8567046fe3c0d1354fc3a7a6f81d9661a661.zip | |
efi_selftest: allow building relocation code on x86_64
Variables EFI_RELOC and EFI_CRT0 have to be defined to build the
EFI unit tests. This patch ensures this for the x86 architecure.
If we compile with EFI_STUB, the bitness depends on CONFIG_EFI_STUB_64BIT.
Otherwise the bitness depends on CONFIG_X86_64.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | arch/x86/config.mk | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/arch/x86/config.mk b/arch/x86/config.mk index 97db03deee..5f77f98e60 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -86,9 +86,9 @@ else PLATFORM_CPPFLAGS += -D__I386__ endif -ifneq ($(CONFIG_EFI_STUB)$(CONFIG_CMD_BOOTEFI_HELLO_COMPILE),) +ifdef CONFIG_EFI_STUB -ifneq ($(CONFIG_EFI_STUB_64BIT),) +ifdef CONFIG_EFI_STUB_64BIT EFI_LDS := elf_x86_64_efi.lds EFI_CRT0 := crt0_x86_64_efi.o EFI_RELOC := reloc_x86_64_efi.o @@ -98,10 +98,22 @@ EFI_CRT0 := crt0_ia32_efi.o EFI_RELOC := reloc_ia32_efi.o endif +else + ifdef CONFIG_X86_64 -EFI_TARGET := --target=efi-app-x86_64 +EFI_LDS := elf_x86_64_efi.lds +EFI_CRT0 := crt0_x86_64_efi.o +EFI_RELOC := reloc_x86_64_efi.o else -EFI_TARGET := --target=efi-app-ia32 +EFI_LDS := elf_ia32_efi.lds +EFI_CRT0 := crt0_ia32_efi.o +EFI_RELOC := reloc_ia32_efi.o +endif + endif +ifdef CONFIG_X86_64 +EFI_TARGET := --target=efi-app-x86_64 +else +EFI_TARGET := --target=efi-app-ia32 endif |