aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-07-03 15:23:38 -0600
committerTom Rini <trini@konsulko.com>2024-07-10 13:36:36 -0600
commita6984f35e9c615b0c87c36e1080ca32e4741ecd8 (patch)
tree498bd4a17e8a2b5258603aae5ceb432461ba798f
parent0765d2c4d6a2539a2160c8185dfd07de22a30bc3 (diff)
downloadu-boot-WIP/10Jul2024.tar.gz
bootstash: Do not provide a default address for allWIP/10Jul2024
A valid memory location to stash bootstage information at will be architecture dependent. Move the existing defaults to the main Kconfig file for this option and set 0x0 as the default only for sandbox. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--arch/arm/mach-stm32mp/Kconfig.13x3
-rw-r--r--arch/arm/mach-stm32mp/Kconfig.15x3
-rw-r--r--arch/arm/mach-stm32mp/Kconfig.25x3
-rw-r--r--boot/Kconfig4
4 files changed, 3 insertions, 10 deletions
diff --git a/arch/arm/mach-stm32mp/Kconfig.13x b/arch/arm/mach-stm32mp/Kconfig.13x
index 4d74b35055b..bc8b3f8cf77 100644
--- a/arch/arm/mach-stm32mp/Kconfig.13x
+++ b/arch/arm/mach-stm32mp/Kconfig.13x
@@ -28,9 +28,6 @@ config PRE_CON_BUF_ADDR
config PRE_CON_BUF_SZ
default 4096
-config BOOTSTAGE_STASH_ADDR
- default 0xC3000000
-
if BOOTCOUNT_GENERIC
config SYS_BOOTCOUNT_SINGLEWORD
default y
diff --git a/arch/arm/mach-stm32mp/Kconfig.15x b/arch/arm/mach-stm32mp/Kconfig.15x
index d99aa9fd694..42da36a73e8 100644
--- a/arch/arm/mach-stm32mp/Kconfig.15x
+++ b/arch/arm/mach-stm32mp/Kconfig.15x
@@ -86,9 +86,6 @@ config PRE_CON_BUF_ADDR
config PRE_CON_BUF_SZ
default 4096
-config BOOTSTAGE_STASH_ADDR
- default 0xC3000000
-
if BOOTCOUNT_GENERIC
config SYS_BOOTCOUNT_SINGLEWORD
default y
diff --git a/arch/arm/mach-stm32mp/Kconfig.25x b/arch/arm/mach-stm32mp/Kconfig.25x
index 2c0f691f8b5..7d2d8171845 100644
--- a/arch/arm/mach-stm32mp/Kconfig.25x
+++ b/arch/arm/mach-stm32mp/Kconfig.25x
@@ -24,9 +24,6 @@ config PRE_CON_BUF_ADDR
config PRE_CON_BUF_SZ
default 4096
-config BOOTSTAGE_STASH_ADDR
- default 0x87000000
-
if DEBUG_UART
config DEBUG_UART_BOARD_INIT
diff --git a/boot/Kconfig b/boot/Kconfig
index ffcae840a50..18f3c85292a 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -1002,7 +1002,9 @@ config BOOTSTAGE_STASH
config BOOTSTAGE_STASH_ADDR
hex "Address to stash boot timing information"
- default 0x0
+ default 0xC3000000 if STM32MP13X || STM32MP15X
+ default 0x87000000 if STM32MP25X
+ default 0x0 if SANDBOX
help
Provide an address which will not be overwritten by the OS when it
starts, so that it can read this information when ready.