On Thu, 4 Apr 2024 at 14:50, Heinrich Schuchardt <heinrich.schucha...@canonical.com> wrote: > > 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.schucha...@canonical.com> > --- > v2: > new patch > --- > Makefile | 1 + > arch/sandbox/config.mk | 2 -- > include/host_arch.h | 2 ++ > lib/efi_loader/Makefile | 3 +-- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Makefile b/Makefile > index ba660976547..1069adca91e 100644 > --- a/Makefile > +++ b/Makefile > @@ -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 1d50991f8d2..405843800e9 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 169d4945136..261194bd7c6 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 fcb0af7e7d6..086521fb287 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)" \ > -- > 2.43.0 >
Acked-by: Ilias Apalodimas <ilias.apalodi...@linaro.org>