cmd: Prepare sysboot command independence

[oweals/u-boot.git] / common / cli.c

diff --git a/common/cli.c b/common/cli.c
index 51b8d5f85cbb4fa57b46129d13f3de837a897c70..67ceb635a67776ef3315e156e5b9e40836a2c1a6 100644 (file)
--- a/common/cli.c
+++ b/common/cli.c
@@ -11,7 +11,9 @@
 #include <common.h>
 #include <cli.h>
 #include <cli_hush.h>
+#include <command.h>
 #include <console.h>
+#include <env.h>
 #include <fdtdec.h>
 #include <malloc.h>
 
@@ -27,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 int run_command(const char *cmd, int flag)
 {
-#ifndef CONFIG_HUSH_PARSER
+#if !CONFIG_IS_ENABLED(HUSH_PARSER)
        /*
         * cli_run_command can return 0 or 1 for success, so clean up
         * its result.
@@ -213,6 +215,7 @@ err:
 
 void cli_loop(void)
 {
+       bootstage_mark(BOOTSTAGE_ID_ENTER_CLI_LOOP);
 #ifdef CONFIG_HUSH_PARSER
        parse_file_outer();
        /* This point is never reached */