From: Simon Glass <sjg@chromium.org>
Date: Mon, 14 Mar 2016 01:07:30 +0000 (-0600)
Subject: sandbox: Avoid calling commands when not available
X-Git-Tag: v2016.05-rc1~225
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2b6793de2543e16ac6b8e792cef71ce7bb6ea1a7;p=oweals%2Fu-boot.git

sandbox: Avoid calling commands when not available

Don't try to run commands when not supported.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 0dda4fc84e..969618ef87 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -83,13 +83,14 @@ int sandbox_main_loop_init(void)
 
 		cli_init();
 
+#ifdef CONFIG_CMDLINE
 		if (state->cmd)
 			retval = run_command_list(state->cmd, -1, 0);
 
 		if (state->run_distro_boot)
 			retval = cli_simple_run_command("run distro_bootcmd",
 							0);
-
+#endif
 		if (!state->interactive)
 			os_exit(retval);
 	}
@@ -265,6 +266,13 @@ static int sandbox_cmdline_cb_verbose(struct sandbox_state *state,
 }
 SANDBOX_CMDLINE_OPT_SHORT(verbose, 'v', 0, "Show test output");
 
+int board_run_command(const char *cmdline)
+{
+	printf("## Commands are disabled. Please enable CONFIG_CMDLINE.\n");
+
+	return 1;
+}
+
 int main(int argc, char *argv[])
 {
 	struct sandbox_state *state;