On Fri, Oct 04, 2024 at 02:46:51PM +0200, Caleb Connolly wrote:
> When CONFIG_BOOT_RETRY is enabled, make hush shell always run the
> bootcmd. This is an improvement over failing to build.
>
> Signed-off-by: Caleb Connolly <caleb.conno...@linaro.org>
> ---
> common/cli_hush.c | 2 +-
> common/cli_hush_upstream.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/common/cli_hush.c b/common/cli_hush.c
> index a6a8edce1f43..3c6fd6f00a1d 100644
> --- a/common/cli_hush.c
> +++ b/common/cli_hush.c
> @@ -1028,9 +1028,9 @@ static void get_user_input(struct in_str *i)
> puts("\nTimeout waiting for command\n");
> # ifdef CONFIG_RESET_TO_RETRY
> do_reset(NULL, 0, 0, NULL);
> # else
> -# error "This currently only works with CONFIG_RESET_TO_RETRY enabled"
> + strcpy(console_buffer, "run bootcmd\n");
> # endif
> }
> #endif
> if (n == -1 ) {
> diff --git a/common/cli_hush_upstream.c b/common/cli_hush_upstream.c
> index ab5aa5f9b36a..93eb0d85a95a 100644
> --- a/common/cli_hush_upstream.c
> +++ b/common/cli_hush_upstream.c
> @@ -2907,9 +2907,9 @@ static void get_user_input(struct in_str *i)
> puts("\nTimeout waiting for command\n");
> # ifdef CONFIG_RESET_TO_RETRY
> do_reset(NULL, 0, 0, NULL);
> # else
> -# error "This currently only works with CONFIG_RESET_TO_RETRY enabled"
> + strcpy(console_buffer, "run bootcmd\n");
> # endif
> }
> # endif
> if (n == -1 ) {Lets add RETRY_BOOTCMD or something instead, I feel like there's some locked-down systems that rely on this behavior. -- Tom
signature.asc
Description: PGP signature
