Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bootstd: Allow enabling BOOTSTD_FULL without needing EXPO

Browse source 
It is sometimes useful to have one without the other, e.g. on a device
without a display, since at present the expo feature requires CONFIG_VIDEO
to be enabled.

Update the Makefile and bootflow command to support this, as well as the
EXPO dependency.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-01-28 15:00:18 -07:00 • committed by Tom Rini
parent d472e93ab4
commit 0041b1c09a
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cmd/bootflow.c
View file

@ -394,15 +394,20 @@ static int do_bootflow_menu(struct cmd_tbl *cmdtp, int flag, int argc,
if (ret)
return CMD_RET_FAILURE;
ret = bootflow_menu_run(std, text_mode, &bflow);
if (ret) {
if (ret == -EAGAIN)
printf("Nothing chosen\n");
else
printf("Menu failed (err=%d)\n", ret);
return CMD_RET_FAILURE;
if (IS_ENABLED(CONFIG_EXPO)) {
ret = bootflow_menu_run(std, text_mode, &bflow);
if (ret) {
if (ret == -EAGAIN)
printf("Nothing chosen\n");
else
printf("Menu failed (err=%d)\n", ret);
}
} else {
printf("Menu not supported\n");
ret = -ENOSYS;
}
if (ret)
return CMD_RET_FAILURE;
printf("Selected: %s\n", bflow->os_name ? bflow->os_name : bflow->name);
std->cur_bootflow = bflow;