diff options
| author | Simon Glass <sjg@chromium.org> | 2023-05-06 08:27:09 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-05-13 09:52:32 -0400 |
| commit | d8d40bc392d1ce60660e479a73970666e6a8a7be (patch) | |
| tree | a3c9f6adf86620bc867c33c766af65e8a4786384 | |
| parent | ab16a3d904e440a6f55aedf7a6c32b9d70168b50 (diff) | |
| download | u-boot-d8d40bc392d1ce60660e479a73970666e6a8a7be.tar.gz | |
bootstd: Correct default boot command
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: a91492b6e9c ("bootstd: Provide a default command")
| -rw-r--r-- | boot/Kconfig | 4 | ||||
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | cmd/bootflow.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index 9882812eecb..fad8e530b17 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1554,8 +1554,8 @@ config USE_BOOTCOMMAND config BOOTCOMMAND string "bootcmd value" depends on USE_BOOTCOMMAND && !USE_DEFAULT_ENV_FILE - default "bootflow scan -lb" if BOOTSTD_BOOTCOMMAND && CMD_BOOTFLOW_FULL - default "bootflow scan" if BOOTSTD_BOOTCOMMAND && !CMD_BOOTFLOW_FULL + default "bootflow scan -lb" if BOOTSTD_DEFAULTS && CMD_BOOTFLOW_FULL + default "bootflow scan" if BOOTSTD_DEFAULTS && !CMD_BOOTFLOW_FULL default "run distro_bootcmd" if !BOOTSTD_BOOTCOMMAND && DISTRO_DEFAULTS help This is the string of commands that will be used as bootcmd and if diff --git a/cmd/Kconfig b/cmd/Kconfig index 87291e2d84d..365371fb511 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -258,7 +258,7 @@ config CMD_BOOTFLOW config CMD_BOOTFLOW_FULL bool "bootflow - extract subcommands" depends on BOOTSTD_FULL - default y if BOOTSTD_FULL + default y help Add the ability to list the available bootflows, select one and obtain information about it. diff --git a/cmd/bootflow.c b/cmd/bootflow.c index cfe34226989..6cc58e48c7d 100644 --- a/cmd/bootflow.c +++ b/cmd/bootflow.c @@ -125,7 +125,7 @@ static int do_bootflow_scan(struct cmd_tbl *cmdtp, int flag, int argc, dev = std->cur_bootdev; } else { 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; } boot = true; |