summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlper Nebi Yasak <alpernebiyasak@gmail.com>2025-04-23 22:20:16 +0300
committerAlper Nebi Yasak <alpernebiyasak@gmail.com>2025-04-29 15:31:11 +0300
commit1265927ca38f2f189769775a0d680820e619d565 (patch)
tree3f19b1472294dda14d1813a69f1ddcc3902b64fd
parent5bea1fade9a1560c603e6f778989ae76c6ee2099 (diff)
u-boot: gru: Disable INIT_SP_RELATIVE
Recently, gru boards were migrated to use common stack addresses with U-Boot commit 5e7cd8a11995 ("rockchip: Use common bss and stack addresses on RK3399") and commit 49f8131e5594 ("rockchip: rk3399-gru: Use TPL with common bss and stack addresses"). This is done with the ROCKCHIP_COMMON_STACK_ADDR config. With POSITION_INDEPENDENT, INIT_SP_RELATIVE defaults to enabled as well. However, ROCKCHIP_COMMON_STACK_ADDR selects HAS_CUSTOM_SYS_INIT_SP_ADDR, which depends on INIT_SP_RELATIVE being disabled. So this results in a configuration warning: WARNING: unmet direct dependencies detected for HAS_CUSTOM_SYS_INIT_SP_ADDR Depends on [n]: ARM [=y] && ARCH_KIRKWOOD [=n] || ARC [=n] || ARM [=y] && !INIT_SP_RELATIVE [=y] || MIPS [=n] || PPC [=n] || RISCV [=n] Selected by [y]: - ROCKCHIP_COMMON_STACK_ADDR [=y] && ARM [=y] && ARCH_ROCKCHIP [=y] && SPL_SHARES_INIT_SP_ADDR [=y] I'm not sure if adhering to the Rockchip values means we can't be position-independent. Disabling INIT_SP_RELATIVE still appears to keep my kevin board working, so let's do that for now. Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
-rw-r--r--config/u-boot/gru_bob/config/default3
-rw-r--r--config/u-boot/gru_kevin/config/default3
2 files changed, 2 insertions, 4 deletions
diff --git a/config/u-boot/gru_bob/config/default b/config/u-boot/gru_bob/config/default
index 552d0542..cc93540c 100644
--- a/config/u-boot/gru_bob/config/default
+++ b/config/u-boot/gru_bob/config/default
@@ -54,8 +54,7 @@ CONFIG_ARM64=y
CONFIG_ARM64_CRC32=y
CONFIG_COUNTER_FREQUENCY=24000000
CONFIG_POSITION_INDEPENDENT=y
-CONFIG_INIT_SP_RELATIVE=y
-CONFIG_SYS_INIT_SP_BSS_OFFSET=524288
+# CONFIG_INIT_SP_RELATIVE is not set
CONFIG_LNX_KRNL_IMG_TEXT_OFFSET_BASE=0x18000000
# CONFIG_DRIVER_GICV2 is not set
# CONFIG_GIC_V3_ITS is not set
diff --git a/config/u-boot/gru_kevin/config/default b/config/u-boot/gru_kevin/config/default
index 978e6760..310fcb6f 100644
--- a/config/u-boot/gru_kevin/config/default
+++ b/config/u-boot/gru_kevin/config/default
@@ -54,8 +54,7 @@ CONFIG_ARM64=y
CONFIG_ARM64_CRC32=y
CONFIG_COUNTER_FREQUENCY=24000000
CONFIG_POSITION_INDEPENDENT=y
-CONFIG_INIT_SP_RELATIVE=y
-CONFIG_SYS_INIT_SP_BSS_OFFSET=524288
+# CONFIG_INIT_SP_RELATIVE is not set
CONFIG_LNX_KRNL_IMG_TEXT_OFFSET_BASE=0x18000000
# CONFIG_DRIVER_GICV2 is not set
# CONFIG_GIC_V3_ITS is not set