diff options
| author | Tom Rini <trini@konsulko.com> | 2024-07-15 12:42:00 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-07-19 16:48:07 -0600 |
| commit | b81e31a1e6c5e0b20537fa8ffba67696dec46d58 (patch) | |
| tree | 32de4fc057b04eec6cb089be0cb27ce19f90d6ec /common | |
| parent | 6b8df6055ab5b37c27679a5cd8ba61f702cab120 (diff) | |
| download | u-boot-b81e31a1e6c5e0b20537fa8ffba67696dec46d58.tar.gz u-boot-b81e31a1e6c5e0b20537fa8ffba67696dec46d58.tar.bz2 u-boot-b81e31a1e6c5e0b20537fa8ffba67696dec46d58.zip | |
bootstash: Do not provide a default address for all
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.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 5 | ||||
| -rw-r--r-- | common/bootstage.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/common/board_f.c b/common/board_f.c index 22c180b218..29e185137a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -810,10 +810,7 @@ static int initf_bootstage(void) if (ret) return ret; if (from_spl) { - const void *stash = map_sysmem(CONFIG_BOOTSTAGE_STASH_ADDR, - CONFIG_BOOTSTAGE_STASH_SIZE); - - ret = bootstage_unstash(stash, CONFIG_BOOTSTAGE_STASH_SIZE); + ret = bootstage_stash_default(); if (ret && ret != -ENOENT) { debug("Failed to unstash bootstage: err=%d\n", ret); return ret; diff --git a/common/bootstage.c b/common/bootstage.c index df83eb684c..b6c268d9f4 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -500,6 +500,7 @@ int bootstage_unstash(const void *base, int size) return 0; } +#if IS_ENABLED(CONFIG_BOOTSTAGE_STASH) int _bootstage_stash_default(void) { return bootstage_stash(map_sysmem(CONFIG_BOOTSTAGE_STASH_ADDR, 0), @@ -513,6 +514,7 @@ int _bootstage_unstash_default(void) return bootstage_unstash(stash, CONFIG_BOOTSTAGE_STASH_SIZE); } +#endif int bootstage_get_size(void) { |