[PATCH] Kconfig.boot: Make 0x0 the default SYS_TEXT_BASE for POSITION_INDEPENDENT
When we build U-Boot with POSITION_INDEPENDENT we must have SYS_TEXT_BASE be set to zero. Make this the default in that case.
Signed-off-by: Tom Rini trini@konsulko.com --- common/Kconfig.boot | 1 + 1 file changed, 1 insertion(+)
diff --git a/common/Kconfig.boot b/common/Kconfig.boot index 89a3161f1faa..f078743f06ed 100644 --- a/common/Kconfig.boot +++ b/common/Kconfig.boot @@ -358,6 +358,7 @@ config HAVE_SYS_TEXT_BASE
config SYS_TEXT_BASE depends on HAVE_SYS_TEXT_BASE + default 0x0 if POSITION_INDEPENDENT default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3 default 0x4a000000 if ARCH_SUNXI && !MACH_SUN9I && !MACH_SUN8I_V3S default 0x2a000000 if ARCH_SUNXI && MACH_SUN9I
From: Tom Rini trini@konsulko.com Date: Fri, 9 Jul 2021 10:39:21 -0400
When we build U-Boot with POSITION_INDEPENDENT we must have SYS_TEXT_BASE be set to zero. Make this the default in that case.
Makes sense. I had to set this for the (still in progress) Apple M1 support. So:
Reviewed-by: Mark Kettenis kettenis@openbsd.org
P.S. Any chance of picking up the first diff I sent a while ago that was acked by Marc Zyngier?
https://patchwork.ozlabs.org/project/uboot/patch/20210210191456.25644-1-kett...
Signed-off-by: Tom Rini trini@konsulko.com
common/Kconfig.boot | 1 + 1 file changed, 1 insertion(+)
diff --git a/common/Kconfig.boot b/common/Kconfig.boot index 89a3161f1faa..f078743f06ed 100644 --- a/common/Kconfig.boot +++ b/common/Kconfig.boot @@ -358,6 +358,7 @@ config HAVE_SYS_TEXT_BASE
config SYS_TEXT_BASE depends on HAVE_SYS_TEXT_BASE
- default 0x0 if POSITION_INDEPENDENT default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3 default 0x4a000000 if ARCH_SUNXI && !MACH_SUN9I && !MACH_SUN8I_V3S default 0x2a000000 if ARCH_SUNXI && MACH_SUN9I
-- 2.17.1
On Fri, Jul 09, 2021 at 05:02:19PM +0200, Mark Kettenis wrote:
From: Tom Rini trini@konsulko.com Date: Fri, 9 Jul 2021 10:39:21 -0400
When we build U-Boot with POSITION_INDEPENDENT we must have SYS_TEXT_BASE be set to zero. Make this the default in that case.
Makes sense. I had to set this for the (still in progress) Apple M1 support. So:
Reviewed-by: Mark Kettenis kettenis@openbsd.org
P.S. Any chance of picking up the first diff I sent a while ago that was acked by Marc Zyngier?
https://patchwork.ozlabs.org/project/uboot/patch/20210210191456.25644-1-kettenis@openbsd.org/
Ah that, yeah, I need to get a PR going of general ARM changes, I should do that today, thanks.
On Fri, Jul 09, 2021 at 10:39:21AM -0400, Tom Rini wrote:
When we build U-Boot with POSITION_INDEPENDENT we must have SYS_TEXT_BASE be set to zero. Make this the default in that case.
Signed-off-by: Tom Rini trini@konsulko.com Reviewed-by: Mark Kettenis kettenis@openbsd.org
Applied to u-boot/master, thanks!
participants (2)
-
Mark Kettenis -
Tom Rini