diff options
| author | Simon Glass <sjg@chromium.org> | 2023-05-06 17:27:09 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-05-13 16:52:32 +0300 |
| commit | d8d40bc392d1ce60660e479a73970666e6a8a7be (patch) | |
| tree | a3c9f6adf86620bc867c33c766af65e8a4786384 /boot | |
| parent | ab16a3d904e440a6f55aedf7a6c32b9d70168b50 (diff) | |
| download | u-boot-d8d40bc392d1ce60660e479a73970666e6a8a7be.tar.xz | |
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")
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index 9882812eec..fad8e530b1 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 |