[PATCH] Make the sandbox board_run_command the default

[PATCH] Make the sandbox board_run_command the default

[Sean Anderson]

If CONFIG_CMDLINE=n, common/cli.c calls board_run_command. This fails to
link on most architectures. However, the sandbox architecture has an
implementation which we can use.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
---
 arch/sandbox/cpu/start.c | 7 -------
 common/cli.c             | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index fff9cbdd79..5b7d54869d 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -319,13 +319,6 @@ static int sandbox_cmdline_cb_show_of_platdata(struct
sandbox_state *state,
 }
 SANDBOX_CMDLINE_OPT(show_of_platdata, 0, "Show of-platdata in SPL");

-int board_run_command(const char *cmdline)
-{
-	printf("## Commands are disabled. Please enable CONFIG_CMDLINE.\n");
-
-	return 1;
-}
-
 static void setup_ram_buf(struct sandbox_state *state)
 {
 	/* Zero the RAM buffer if we didn't read it, to keep valgrind happy */
diff --git a/common/cli.c b/common/cli.c
index 67ceb635a6..59551ef40b 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -70,6 +70,13 @@ int run_command_repeatable(const char *cmd, int flag)
 	return 0;
 #endif
 }
+#else
+__weak int board_run_command(const char *cmdline)
+{
+	printf("## Commands are disabled. Please enable CONFIG_CMDLINE.\n");
+
+	return 1;
+}
 #endif /* CONFIG_CMDLINE */

 int run_command_list(const char *cmd, int len, int flag)
-- 
2.23.0

[PATCH] Make the sandbox board_run_command the default

[Simon Glass]

Hi Sean,

On Thu, 19 Dec 2019 at 01:08, Sean Anderson <seanga2@gmail.com> wrote:
>
> If CONFIG_CMDLINE=n, common/cli.c calls board_run_command. This fails to
> link on most architectures. However, the sandbox architecture has an
> implementation which we can use.
>
> Signed-off-by: Sean Anderson <seanga2@gmail.com>
> ---
>  arch/sandbox/cpu/start.c | 7 -------
>  common/cli.c             | 7 +++++++
>  2 files changed, 7 insertions(+), 7 deletions(-)

Somehow this patch is showing as corrupted. Did you create it with patman?

Regards,
Simon

[PATCH] Make the sandbox board_run_command the default

[Sean Anderson]

> Somehow this patch is showing as corrupted. Did you create it with patman?

I created it with git format-patch. Perhaps it got mangled by my email client.

[PATCH v2] cli: Make the sandbox board_run_command the default

[Sean Anderson]

If CONFIG_CMDLINE=n, common/cli.c calls board_run_command. This fails to
link on most architectures. However, the sandbox architecture has an
implementation which we can use.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
---
Changes for v2:
 - Sent without any word wrap afaik
 - Rebased onto v2020.01

 arch/sandbox/cpu/start.c | 7 -------
 common/cli.c             | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index fff9cbdd79..5b7d54869d 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -319,13 +319,6 @@ static int sandbox_cmdline_cb_show_of_platdata(struct sandbox_state *state,
 }
 SANDBOX_CMDLINE_OPT(show_of_platdata, 0, "Show of-platdata in SPL");
 
-int board_run_command(const char *cmdline)
-{
-	printf("## Commands are disabled. Please enable CONFIG_CMDLINE.\n");
-
-	return 1;
-}
-
 static void setup_ram_buf(struct sandbox_state *state)
 {
 	/* Zero the RAM buffer if we didn't read it, to keep valgrind happy */
diff --git a/common/cli.c b/common/cli.c
index 67ceb635a6..59551ef40b 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -70,6 +70,13 @@ int run_command_repeatable(const char *cmd, int flag)
 	return 0;
 #endif
 }
+#else
+__weak int board_run_command(const char *cmdline)
+{
+	printf("## Commands are disabled. Please enable CONFIG_CMDLINE.\n");
+
+	return 1;
+}
 #endif /* CONFIG_CMDLINE */
 
 int run_command_list(const char *cmd, int len, int flag)
-- 
2.24.1

[PATCH v2] cli: Make the sandbox board_run_command the default

[Bin Meng]

On Sat, Jan 11, 2020 at 1:32 AM Sean Anderson <seanga2@gmail.com> wrote:
>
> If CONFIG_CMDLINE=n, common/cli.c calls board_run_command. This fails to
> link on most architectures. However, the sandbox architecture has an
> implementation which we can use.
>
> Signed-off-by: Sean Anderson <seanga2@gmail.com>
> ---
> Changes for v2:
>  - Sent without any word wrap afaik
>  - Rebased onto v2020.01
>
>  arch/sandbox/cpu/start.c | 7 -------
>  common/cli.c             | 7 +++++++
>  2 files changed, 7 insertions(+), 7 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

[PATCH v2] cli: Make the sandbox board_run_command the default

[sjg at google.com]

On Sat, Jan 11, 2020 at 1:32 AM Sean Anderson <seanga2@gmail.com> wrote:
>
> If CONFIG_CMDLINE=n, common/cli.c calls board_run_command. This fails to
> link on most architectures. However, the sandbox architecture has an
> implementation which we can use.
>
> Signed-off-by: Sean Anderson <seanga2@gmail.com>
> ---
> Changes for v2:
>  - Sent without any word wrap afaik
>  - Rebased onto v2020.01
>
>  arch/sandbox/cpu/start.c | 7 -------
>  common/cli.c             | 7 +++++++
>  2 files changed, 7 insertions(+), 7 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Applied to u-boot-dm, thanks!