projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'video-for-2021.01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot...
[platform/kernel/u-boot.git]
/
common
/
cli.c
diff --git
a/common/cli.c
b/common/cli.c
index
57874d8
..
6635ab2
100644
(file)
--- a/
common/cli.c
+++ b/
common/cli.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@
-5,15
+6,17
@@
* Add to readline cmdline-editing by
* (C) Copyright 2005
* JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com>
* Add to readline cmdline-editing by
* (C) Copyright 2005
* JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
+#include <bootstage.h>
#include <cli.h>
#include <cli_hush.h>
#include <cli.h>
#include <cli_hush.h>
+#include <command.h>
#include <console.h>
#include <console.h>
+#include <env.h>
#include <fdtdec.h>
#include <fdtdec.h>
+#include <hang.h>
#include <malloc.h>
DECLARE_GLOBAL_DATA_PTR;
#include <malloc.h>
DECLARE_GLOBAL_DATA_PTR;
@@
-28,7
+31,7
@@
DECLARE_GLOBAL_DATA_PTR;
*/
int run_command(const char *cmd, int flag)
{
*/
int run_command(const char *cmd, int flag)
{
-#if
ndef CONFIG_HUSH_PARSER
+#if
!CONFIG_IS_ENABLED(HUSH_PARSER)
/*
* cli_run_command can return 0 or 1 for success, so clean up
* its result.
/*
* cli_run_command can return 0 or 1 for success, so clean up
* its result.
@@
-69,6
+72,13
@@
int run_command_repeatable(const char *cmd, int flag)
return 0;
#endif
}
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)
#endif /* CONFIG_CMDLINE */
int run_command_list(const char *cmd, int len, int flag)
@@
-119,7
+129,7
@@
int run_command_list(const char *cmd, int len, int flag)
/****************************************************************************/
#if defined(CONFIG_CMD_RUN)
/****************************************************************************/
#if defined(CONFIG_CMD_RUN)
-int do_run(
cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
+int do_run(
struct cmd_tbl *cmdtp, int flag, int argc, char *
const argv[])
{
int i;
{
int i;
@@
-173,7
+183,7
@@
bool cli_process_fdt(const char **cmdp)
void cli_secure_boot_cmd(const char *cmd)
{
#ifdef CONFIG_CMDLINE
void cli_secure_boot_cmd(const char *cmd)
{
#ifdef CONFIG_CMDLINE
-
cmd_tbl_t
*cmdtp;
+
struct cmd_tbl
*cmdtp;
#endif
int rc;
#endif
int rc;
@@
-214,6
+224,7
@@
err:
void cli_loop(void)
{
void cli_loop(void)
{
+ bootstage_mark(BOOTSTAGE_ID_ENTER_CLI_LOOP);
#ifdef CONFIG_HUSH_PARSER
parse_file_outer();
/* This point is never reached */
#ifdef CONFIG_HUSH_PARSER
parse_file_outer();
/* This point is never reached */