From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 3 Aug 2024 12:41:44 +0000 (+0000)
Subject: bootstage: Fix unstash of records from SPL
X-Git-Url: http://git.dujemihanovic.xyz/posts?a=commitdiff_plain;h=e83ced1a24095de66e526bd6c10f0f24584baaee;p=u-boot.git

bootstage: Fix unstash of records from SPL

The commit b81e31a1e6c5 ("bootstash: Do not provide a default address
for all") changed a bootstage unstash call to bootstage stash, this
has resulted in bootstage records stashed in SPL no longer get unstaged
in U-Boot proper. Fix this by changing back to a unstage call.

Fixes: b81e31a1e6c5 ("bootstash: Do not provide a default address for all")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

diff --git a/common/board_f.c b/common/board_f.c
index d9fe6f997a..154675d0e4 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -797,7 +797,7 @@ static int initf_bootstage(void)
 	if (ret)
 		return ret;
 	if (from_spl) {
-		ret = bootstage_stash_default();
+		ret = bootstage_unstash_default();
 		if (ret && ret != -ENOENT) {
 			debug("Failed to unstash bootstage: err=%d\n", ret);
 			return ret;