On Fri, Nov 01, 2019 at 08:53:38PM +0100, Lucas Stach wrote: > Commit 2a94e821ba2e (ARM: For relocatable image force TEXT_BASE 0x0) > intended to force the TEXT_BASE to zero for relocatable images, but > the change added the Kconfig symbol overriding the TEXT_BASE > unconditionally. This breaks non-relocatable images. > > Signed-off-by: Lucas Stach <l.st...@pengutronix.de> > --- > arch/arm/Kconfig | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 652ac24ce3fa..f4e943a8fd8a 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -19,9 +19,11 @@ config ARM_USE_COMPRESSED_DTB > select UNCOMPRESS > select LZO_DECOMPRESS > > +if RELOCATABLE > config TEXT_BASE > hex > default 0x0 > +endif
Does this really fix something? For example in the freescale-mx21-ads_defconfig we have CONFIG_TEXT_BASE=0xc3000000 which is still shown in Kconfig and barebox is correctly built with that TEXT_BASE. Yes, without this patch we have a duplicate symbol in Kconfig with concurrent default values, but the files seem to be sourced in the right order. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
