aboutsummaryrefslogtreecommitdiffstats
path: root/boot/bootflow.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2022-07-30 15:52:27 -0600
committerTom Rini <trini@konsulko.com>2022-08-12 08:17:11 -0400
commitc627cfc14c08a803f5aa9e39d841dcf990d8d034 (patch)
tree17a5e5c90db361f5df94fa42c77531450fa0a58b /boot/bootflow.c
parentee8ab07e3039d945889dccd8e8ab7adfb9f8c30c (diff)
downloadu-boot-c627cfc14c08a803f5aa9e39d841dcf990d8d034.tar.gz
bootstd: Allow scanning for global bootmeths separately
Typically we want to find and use global bootmeths first, since they have the best idea of how the system should boot. We then use normal bootmeths as a fallback. Add the logic for this, putting global bootmeths at the end of the ordering. We can then easily scan the global bootmeths first, then drop them from the list for subsequent bootdev-centric scans. This changes the ordering of global bootmeths, so update the bootflow_system() accordingly. Drop the comment from bootmeth_setup_iter_order() since this is an exported function and it should be in the header file. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'boot/bootflow.c')
-rw-r--r--boot/bootflow.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot/bootflow.c b/boot/bootflow.c
index 08ea0336324..5d94a27ff84 100644
--- a/boot/bootflow.c
+++ b/boot/bootflow.c
@@ -278,7 +278,7 @@ int bootflow_scan_bootdev(struct udevice *dev, struct bootflow_iter *iter,
if (ret)
return log_msg_ret("obdev", -ENODEV);
- ret = bootmeth_setup_iter_order(iter);
+ ret = bootmeth_setup_iter_order(iter, !(flags & BOOTFLOWF_SKIP_GLOBAL));
if (ret)
return log_msg_ret("obmeth", -ENODEV);