summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2025-03-30 08:09:48 -0600
committerTom Rini <trini@konsulko.com>2025-03-30 08:09:48 -0600
commit5ca70325b64f760bf4190f206a0e88dda495e3d2 (patch)
tree782f2e01dd6287b7d8d221a0ba22d5dedae72e9c
parent490aee46f750f16ed1d5a1771d0ef82d32ed8c9e (diff)
parent5c0f34a0c9ea2fb34d608a5adb6632230b1c273c (diff)
Merge branch 'fixes' of https://source.denx.de/u-boot/custodians/u-boot-tegra into next
Ouya and Mocha were added around the same time SPL_HAVE_INIT_STACK was introduced by Simon and therefore do not include this config option. It is critical to add it before any defconfig resync, since the SPL_STACK option will then be removed.
-rw-r--r--configs/mocha_defconfig1
-rw-r--r--configs/ouya_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/configs/mocha_defconfig b/configs/mocha_defconfig
index 0cbedb21797..dfeb16ac08e 100644
--- a/configs/mocha_defconfig
+++ b/configs/mocha_defconfig
@@ -28,6 +28,7 @@ CONFIG_SYS_PBSIZE=2086
CONFIG_SPL_FOOTPRINT_LIMIT=y
CONFIG_SPL_MAX_FOOTPRINT=0x8000
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
+CONFIG_SPL_HAVE_INIT_STACK=y
CONFIG_SPL_SYS_MALLOC=y
CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x80090000
diff --git a/configs/ouya_defconfig b/configs/ouya_defconfig
index ccd6ae4d36f..d4ae9dbb57c 100644
--- a/configs/ouya_defconfig
+++ b/configs/ouya_defconfig
@@ -26,6 +26,7 @@ CONFIG_SYS_PBSIZE=2084
CONFIG_SPL_FOOTPRINT_LIMIT=y
CONFIG_SPL_MAX_FOOTPRINT=0x8000
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
+CONFIG_SPL_HAVE_INIT_STACK=y
CONFIG_SPL_SYS_MALLOC=y
CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x80090000