[PATCH v2 01/29] Makefile: Avoid using TEXT_BASE if not present

[Tom Rini]

On Sat, Feb 08, 2025 at 10:11:21AM -0700, Simon Glass wrote:
> This value is only available if CONFIG_HAVE_TEXT_BASE is enabled. Add
> conditions to avoid introducing errors in link scripts when it is not.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
> Changes in v2:
> - Depend on CONFIG_EFI_APP instead
> - Drop change to u-boot-elf rule
> 
>  Makefile | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/Makefile b/Makefile
> index 2f7614191a1..f989c31073f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1050,8 +1050,10 @@ LDFLAGS_u-boot += -z notext $(call ld-option,--apply-dynamic-relocs)
>  LDFLAGS_u-boot += --build-id=none
>  
>  ifeq ($(CONFIG_ARC)$(CONFIG_NIOS2)$(CONFIG_X86)$(CONFIG_XTENSA),)
> +ifndef CONFIG_EFI_APP
>  LDFLAGS_u-boot += -Ttext $(CONFIG_TEXT_BASE)
>  endif
> +endif
>  
>  # make the checker run with the right architecture
>  CHECKFLAGS += --arch=$(ARCH)

We should just test for ifdef CONFIG_HAVE_TEXT_BASE as the second
condition, that's already going to be never-true for EFI_APP.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20250209/311ebc06/attachment.sig>