diff options
| author | Tom Rini <[email protected]> | 2024-03-04 10:13:01 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-03-04 10:25:47 -0500 |
| commit | bd465ada0e1172910f64feac6035f2344449c381 (patch) | |
| tree | e749428436685ab25dcfe109309adee6f45cdf39 /boot/bootflow.c | |
| parent | bdbbf1d7b55434973402c390a822490ce6e14994 (diff) | |
| parent | 68c4d3098b9cf59a20c470df385eb5422fe32bbe (diff) | |
Merge branch '2024-03-02-assorted-updates' into next
- Assorted MediaTek, ASPEED, xenguest, s5p4418 and qemu-arm fixes
- Assorted test fixes/updates/additions.
- A few bootstd/related fixes.
- Remove common.h from some files
- Drop reiserfs
- A few other assorted fixes throughout the tree.
Diffstat (limited to 'boot/bootflow.c')
| -rw-r--r-- | boot/bootflow.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/boot/bootflow.c b/boot/bootflow.c index 05484fd5b1b..68bf99329ab 100644 --- a/boot/bootflow.c +++ b/boot/bootflow.c @@ -217,6 +217,9 @@ static int iter_incr(struct bootflow_iter *iter) } } + if (iter->flags & BOOTFLOWIF_SINGLE_PARTITION) + return BF_NO_MORE_DEVICES; + /* No more bootmeths; start at the first one, and... */ iter->cur_method = 0; iter->method = iter->method_order[iter->cur_method]; |