diff options
| author | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-04-04 01:00:41 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-04-08 13:04:48 +0200 |
| commit | a0a749787aa4cebd8a1b919ee04cc8f450796fcb (patch) | |
| tree | 8da39804fd0f8461a77883e8be03fff4aa55151c | |
| parent | 8f31929562f5305c0ce94f2f41eedeb231d8d215 (diff) | |
| download | u-boot-a0a749787aa4cebd8a1b919ee04cc8f450796fcb.tar.gz u-boot-a0a749787aa4cebd8a1b919ee04cc8f450796fcb.tar.bz2 u-boot-a0a749787aa4cebd8a1b919ee04cc8f450796fcb.zip | |
efi_loader: move HOST_ARCH to version_autogenerated.h
efi_default_filename.h requires HOST_ARCH to be defined. Up to now we
defined it via a CFLAGS. This does not scale. Add the symbol to
version_autogenerated.h instead.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | arch/sandbox/config.mk | 2 | ||||
| -rw-r--r-- | include/host_arch.h | 2 | ||||
| -rw-r--r-- | lib/efi_loader/Makefile | 3 |
4 files changed, 4 insertions, 4 deletions
@@ -1963,6 +1963,7 @@ define filechk_version.h echo \#define U_BOOT_VERSION_NUM $(VERSION); \ echo \#define U_BOOT_VERSION_NUM_PATCH $$(echo $(PATCHLEVEL) | \ sed -e "s/^0*//"); \ + echo \#define HOST_ARCH $(HOST_ARCH); \ echo \#define CC_VERSION_STRING \"$$(LC_ALL=C $(CC) --version | head -n 1)\"; \ echo \#define LD_VERSION_STRING \"$$(LC_ALL=C $(LD) --version | head -n 1)\"; ) endef diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 1d50991f8d..405843800e 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -69,5 +69,3 @@ EFI_LDS := ${SRCDIR}/../../../arch/riscv/lib/elf_riscv64_efi.lds endif EFI_CRT0 := crt0_sandbox_efi.o EFI_RELOC := reloc_sandbox_efi.o -AFLAGS_crt0_sandbox_efi.o += -DHOST_ARCH="$(HOST_ARCH)" -CFLAGS_reloc_sandbox_efi.o += -DHOST_ARCH="$(HOST_ARCH)" diff --git a/include/host_arch.h b/include/host_arch.h index 169d494513..261194bd7c 100644 --- a/include/host_arch.h +++ b/include/host_arch.h @@ -16,6 +16,8 @@ export HOST_ARCH_X86=0x0386 export HOST_ARCH_X86_64=0x8664 #endif +#include <version.h> + #define HOST_ARCH_AARCH64 0xaa64 #define HOST_ARCH_ARM 0x00a7 #define HOST_ARCH_RISCV32 0x5032 diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index fcb0af7e7d..086521fb28 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -6,8 +6,7 @@ # This file only gets included with CONFIG_EFI_LOADER set, so all # object inclusion implicitly depends on it -asflags-y += -DHOST_ARCH="$(HOST_ARCH)" -I. -ccflags-y += -DHOST_ARCH="$(HOST_ARCH)" +asflags-y += -I. CFLAGS_efi_boottime.o += \ -DFW_VERSION="0x$(VERSION)" \ |