]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
bootstage: Fix unstash of records from SPL
authorJonas Karlman <jonas@kwiboo.se>
Sat, 3 Aug 2024 12:41:44 +0000 (12:41 +0000)
committerTom Rini <trini@konsulko.com>
Wed, 28 Aug 2024 16:07:59 +0000 (10:07 -0600)
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>
common/board_f.c

index d9fe6f997ab746a25ebb4cb2a190e36ecd5ec66f..154675d0e407f1862ea33d430362eeafee083c54 100644 (file)
@@ -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;