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

[Simon Glass]

Hi Tom,

On Mon, 10 Feb 2025 at 07:51, Tom Rini <trini at konsulko.com> wrote:
>
> On Mon, Feb 10, 2025 at 06:06:38AM -0700, Simon Glass wrote:
> > Hi Tom,
> >
> > On Sun, 9 Feb 2025 at 11:05, Tom Rini <trini at konsulko.com> wrote:
> > >
> > > 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.
> >
> > Yes, that's what I had in v1.
> >
> > The problem though is that the ARM app does have HAVE_TEXT_BASE
> > enabled at present.
>
> How?
> config HAVE_TEXT_BASE
>         bool
>         depends on !NIOS2 && !XTENSA
>         depends on !EFI_APP
>         default y
>
> is how we define the symbol.

I'm not sure what I was doing wrong, but it works now, sorry for
noise. I'll revert this patch back to v1.

Regards,
Simon