| commit | 57949a99b7bd0aa21abbde1ffa7e50e5d9e10a4e | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Thu Aug 29 08:15:37 2024 -0600 |
| committer | Tom Rini <trini@konsulko.com> | Thu Aug 29 08:15:37 2024 -0600 |
| tree | 0a6ea6f8d8a0e4c633b63246ff8122a70b5c5f1d | |
| parent | f3a2d793d7ae04634afb727f96ff6b0f6144c8ae [diff] | |
| parent | aec0015a52d3faf723fec9ed9fe1d1af0b89e996 [diff] |
Merge tag 'u-boot-imx-master-20240829' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/22162 - Fix an issue with "tools/buildman/buildman imx8ulp_evk" failing every other time.
diff --git a/common/board_f.c b/common/board_f.c index 29e1851..30d7fbf 100644 --- a/common/board_f.c +++ b/common/board_f.c
@@ -810,7 +810,7 @@ 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;