Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-15 09:27:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

efi_loader: Move to compiler based target architecture determination

Browse source 
Thanks to CONFIG_SANDBOX, we can not rely on config options to tell us
what CPU architecture we're running on.

The compiler however does know that, so let's just move the ifdefs over
to compiler based defines rather than kconfig based options.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2018-06-18 17:23:08 +02:00
parent beb077a2a8
commit bc028919e4
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/efi_loader/efi_runtime.c
View file

@ -32,18 +32,18 @@ static efi_status_t __efi_runtime EFIAPI efi_invalid_parameter(void);
* TODO(sjg@chromium.org): These defines and structs should come from the elf
* header for each arch (or a generic header) rather than being repeated here.
*/
#if defined(CONFIG_ARM64)
#if defined(__aarch64__)
#define R_RELATIVE 1027
#define R_MASK 0xffffffffULL
#define IS_RELA 1
#elif defined(CONFIG_ARM)
#elif defined(__arm__)
#define R_RELATIVE 23
#define R_MASK 0xffULL
#elif defined(CONFIG_X86)
#elif defined(__x86_64__) || defined(__i386__)
#include <asm/elf.h>
#define R_RELATIVE R_386_RELATIVE
#define R_MASK 0xffULL
#elif defined(CONFIG_RISCV)
#elif defined(__riscv)
#include <elf.h>
#define R_RELATIVE R_RISCV_RELATIVE
#define R_MASK 0xffULL
@ -55,12 +55,14 @@ struct dyn_sym {
u32 foo2;
u32 foo3;
};
#ifdef CONFIG_CPU_RISCV_32
#if (__riscv_xlen == 32)
#define R_ABSOLUTE R_RISCV_32
#define SYM_INDEX 8
#else
#elif (__riscv_xlen == 64)
#define R_ABSOLUTE R_RISCV_64
#define SYM_INDEX 32
#else
#error unknown riscv target
#endif
#else
#error Need to add relocation awareness