ARM: uniphier: print Support Card info very late

[u-boot] / arch / sandbox / cpu / start.c

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 4c38fab443f68ab04492d67d9e5a34ed570fb337..6e4ec017ccd98239faf8af7a9730c8bb3567cb4c 100644 (file)
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -73,6 +73,7 @@ static int sandbox_cmdline_cb_help(struct sandbox_state *state, const char *arg)
 }
 SANDBOX_CMDLINE_OPT_SHORT(help, 'h', 0, "Display help");
 
+#ifndef CONFIG_SPL_BUILD
 int sandbox_main_loop_init(void)
 {
        struct sandbox_state *state = state_get_current();
@@ -83,19 +84,21 @@ 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);
        }
 
        return 0;
 }
+#endif
 
 static int sandbox_cmdline_cb_boot(struct sandbox_state *state,
                                      const char *arg)
@@ -257,6 +260,21 @@ static int sandbox_cmdline_cb_terminal(struct sandbox_state *state,
 SANDBOX_CMDLINE_OPT_SHORT(terminal, 't', 1,
                          "Set terminal to raw/cooked mode");
 
+static int sandbox_cmdline_cb_verbose(struct sandbox_state *state,
+                                     const char *arg)
+{
+       state->show_test_output = true;
+       return 0;
+}
+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;