[PATCH 04/16] bootchooser: pass along struct bootentry

Ahmad Fatoum
2026-03-12T14:45:48Z

By plumbing through the parent bootentry, we can merge the overrides
applied for the bootchooser targets onto the actual children if boot
override support is enabled.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
common/bootchooser.c | 13 +++++++++----
include/bootchooser.h | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/bootchooser.c b/common/bootchooser.c
index 07cbdacfeb0a..2a75dfdcc88e 100644
--- a/common/bootchooser.c
+++ b/common/bootchooser.c
@@ -839,7 +839,8 @@ void bootchooser_lock_attempts(bool locked)
attempts_locked = locked;
}

-static int bootchooser_boot_one(struct bootchooser *bc, int *tryagain)
+static int bootchooser_boot_one(struct bootchooser *bc, int *tryagain,
+ struct bootentry *parent_entry)
{
char *system;
struct bootentries *entries;
@@ -873,6 +874,10 @@ static int bootchooser_boot_one(struct bootchooser *bc, int *tryagain)
ret = -ENOENT;

bootentries_for_each_entry(entries, entry) {
+ if (parent_entry)
+ bootm_merge_overrides(&entry->overrides,
+ &parent_entry->overrides);
+
ret = boot_entry(entry, bc->verbose, bc->dryrun);
if (!ret) {
*tryagain = 0;
@@ -889,12 +894,12 @@ static int bootchooser_boot_one(struct bootchooser *bc, int *tryagain)
return ret;
}

-int bootchooser_boot(struct bootchooser *bc)
+int bootchooser_boot(struct bootchooser *bc, struct bootentry *entry)
{
int ret, tryagain;

do {
- ret = bootchooser_boot_one(bc, &tryagain);
+ ret = bootchooser_boot_one(bc, &tryagain, entry);

if (!retry)
break;
@@ -915,7 +920,7 @@ int bootchooser_entry_boot(struct bootentry *entry, int verbose, int dryrun)
bc->verbose = verbose;
bc->dryrun = dryrun;

- ret = bootchooser_boot(bc);
+ ret = bootchooser_boot(bc, entry);

bootchooser_put(bc);

diff --git a/include/bootchooser.h b/include/bootchooser.h
index 36cbd0dd0a01..da3b974ef6f6 100644
--- a/include/bootchooser.h
+++ b/include/bootchooser.h
@@ -14,7 +14,7 @@ int bootchooser_put(struct bootchooser *bootchooser);

void bootchooser_info(struct bootchooser *bootchooser);

-int bootchooser_boot(struct bootchooser *bc);
+int bootchooser_boot(struct bootchooser *bc, struct bootentry *entry);

struct bootchooser_target *bootchooser_get_last_chosen(struct bootchooser *bootchooser);
void bootchooser_lock_attempts(bool locked);
--
2.47.3