vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot: Don't change the method count after global bootmeths

Browse Source 
At present before scanning global bootmeths, the iterator sets the
method count to the index of the first global bootmeth. Now that we
support scanning the global bootmeths multiple times, we must leave this
count alone.

Check against have_global and first_glob_method instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-10-22 14:16:56 -06:00
committed by Tom Rini
parent 4ce78089b2
commit eff1dca963
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot/bootflow.c
+14 -4
View File
@@ -304,9 +304,20 @@ static int iter_incr(struct bootflow_iter *iter)
for (iter->cur_method++; iter->cur_method < iter->num_methods;
iter->cur_method++) {
/* loop until we find a global bootmeth we haven't used */
if (IS_ENABLED(CONFIG_BOOTMETH_GLOBAL) && iter->doing_global &&
!bootmeth_glob_allowed(iter, iter->cur_method))
continue;
if (IS_ENABLED(CONFIG_BOOTMETH_GLOBAL) && iter->doing_global) {
if (!bootmeth_glob_allowed(iter, iter->cur_method))
continue;
iter->method = iter->method_order[iter->cur_method];
log_debug("-> next global method '%s'\n",
iter->method->name);
return 0;
}
/* at this point we are only considering non-global bootmeths */
if (IS_ENABLED(CONFIG_BOOTMETH_GLOBAL) && iter->have_global &&
iter->cur_method >= iter->first_glob_method)
break;
iter->method = iter->method_order[iter->cur_method];
return 0;
@@ -317,7 +328,6 @@ static int iter_incr(struct bootflow_iter *iter)
* normal bootdev scan
*/
if (IS_ENABLED(CONFIG_BOOTMETH_GLOBAL) && global) {
iter->num_methods = iter->first_glob_method;
iter->doing_global = false;
/*