dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

bootstd: Correct default boot command

Browse Source 
The patch to relax flag requirements was not accepted[1], so we still have
to have separate bootcommands depending on CMD_BOOTFLOW_FULL.

The previous attempt at this did not work, since it used the wrong name
for the options.

Fix this and change the message to mention BOOTSTD_FULL since this affects
not just the flags, but all functionality, so is more likely what the user
wants.

Drop the useless condition on CMD_BOOTFLOW_FULL while we are here.

[1] https://patchwork.ozlabs.org/project/uboot/patch/20230329071655.1959513-2-sjg@chromium.org/

Signed-off-by: Simon Glass <sjg@chromium.org>
Fixes: a91492b6e9 ("bootstd: Provide a default command")
This commit is contained in:
Simon Glass
2023-05-06 08:27:09 -06:00
committed by Tom Rini
parent ab16a3d904
commit d8d40bc392
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boot/Kconfig
View File

@@ -1554,8 +1554,8 @@ config USE_BOOTCOMMAND
config BOOTCOMMAND config BOOTCOMMAND
string "bootcmd value" string "bootcmd value"
depends on USE_BOOTCOMMAND && !USE_DEFAULT_ENV_FILE depends on USE_BOOTCOMMAND && !USE_DEFAULT_ENV_FILE
default "bootflow scan -lb" if BOOTSTD_BOOTCOMMAND && CMD_BOOTFLOW_FULL default "bootflow scan -lb" if BOOTSTD_DEFAULTS && CMD_BOOTFLOW_FULL
default "bootflow scan" if BOOTSTD_BOOTCOMMAND && !CMD_BOOTFLOW_FULL default "bootflow scan" if BOOTSTD_DEFAULTS && !CMD_BOOTFLOW_FULL
default "run distro_bootcmd" if !BOOTSTD_BOOTCOMMAND && DISTRO_DEFAULTS default "run distro_bootcmd" if !BOOTSTD_BOOTCOMMAND && DISTRO_DEFAULTS
help help
This is the string of commands that will be used as bootcmd and if This is the string of commands that will be used as bootcmd and if

2
cmd/Kconfig
View File

@@ -258,7 +258,7 @@ config CMD_BOOTFLOW
config CMD_BOOTFLOW_FULL config CMD_BOOTFLOW_FULL
bool "bootflow - extract subcommands" bool "bootflow - extract subcommands"
depends on BOOTSTD_FULL depends on BOOTSTD_FULL
default y if BOOTSTD_FULL default y
help help
Add the ability to list the available bootflows, select one and obtain Add the ability to list the available bootflows, select one and obtain
information about it. information about it.

2
cmd/bootflow.c
View File

@@ -125,7 +125,7 @@ static int do_bootflow_scan(struct cmd_tbl *cmdtp, int flag, int argc,
dev = std->cur_bootdev; dev = std->cur_bootdev;
} else { } else {
if (has_args) { if (has_args) {
printf("Flags not supported: enable CONFIG_BOOTFLOW_FULL\n"); printf("Flags not supported: enable CONFIG_BOOTSTD_FULL\n");
return CMD_RET_USAGE; return CMD_RET_USAGE;
} }
boot = true; boot = true;