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
Convert CONFIG_SYS_FSL_SEC_MON et al to Kconfig
[platform/kernel/u-boot.git]
/
common
/
cli.c
diff --git
a/common/cli.c
b/common/cli.c
index
119d282
..
a7e3d84
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,29
+6,32
@@
* 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>
#include <malloc.h>
+#include <asm/global_data.h>
+#include <dm/ofnode.h>
-DECLARE_GLOBAL_DATA_PTR;
-
+#ifdef CONFIG_CMDLINE
/*
* Run a command using the selected parser.
*
* @param cmd Command to run
* @param flag Execution flags (CMD_FLAG_...)
/*
* Run a command using the selected parser.
*
* @param cmd Command to run
* @param flag Execution flags (CMD_FLAG_...)
- *
@return
0 on success, or != 0 on error.
+ *
Return:
0 on success, or != 0 on error.
*/
int run_command(const char *cmd, int flag)
{
*/
int run_command(const char *cmd, int flag)
{
-#if
ndef CONFIG_SYS_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.
@@
-50,11
+54,11
@@
int run_command(const char *cmd, int flag)
*
* @param cmd Command to run
* @param flag Execution flags (CMD_FLAG_...)
*
* @param cmd Command to run
* @param flag Execution flags (CMD_FLAG_...)
- *
@return
0 (not repeatable) or 1 (repeatable) on success, -1 on error.
+ *
Return:
0 (not repeatable) or 1 (repeatable) on success, -1 on error.
*/
int run_command_repeatable(const char *cmd, int flag)
{
*/
int run_command_repeatable(const char *cmd, int flag)
{
-#ifndef CONFIG_
SYS_
HUSH_PARSER
+#ifndef CONFIG_HUSH_PARSER
return cli_simple_run_command(cmd, flag);
#else
/*
return cli_simple_run_command(cmd, flag);
#else
/*
@@
-68,6
+72,14
@@
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)
{
int run_command_list(const char *cmd, int len, int flag)
{
@@
-77,7
+89,7
@@
int run_command_list(const char *cmd, int len, int flag)
if (len == -1) {
len = strlen(cmd);
if (len == -1) {
len = strlen(cmd);
-#ifdef CONFIG_
SYS_
HUSH_PARSER
+#ifdef CONFIG_HUSH_PARSER
/* hush will never change our string */
need_buff = 0;
#else
/* hush will never change our string */
need_buff = 0;
#else
@@
-92,7
+104,7
@@
int run_command_list(const char *cmd, int len, int flag)
memcpy(buff, cmd, len);
buff[len] = '\0';
}
memcpy(buff, cmd, len);
buff[len] = '\0';
}
-#ifdef CONFIG_
SYS_
HUSH_PARSER
+#ifdef CONFIG_HUSH_PARSER
rcode = parse_string_outer(buff, FLAG_PARSE_SEMICOLON);
#else
/*
rcode = parse_string_outer(buff, FLAG_PARSE_SEMICOLON);
#else
/*
@@
-102,7
+114,11
@@
int run_command_list(const char *cmd, int len, int flag)
* doing a malloc() which is actually required only in a case that
* is pretty rare.
*/
* doing a malloc() which is actually required only in a case that
* is pretty rare.
*/
+#ifdef CONFIG_CMDLINE
rcode = cli_simple_run_command_list(buff, flag);
rcode = cli_simple_run_command_list(buff, flag);
+#else
+ rcode = board_run_command(buff);
+#endif
#endif
if (need_buff)
free(buff);
#endif
if (need_buff)
free(buff);
@@
-113,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;
@@
-123,7
+139,7
@@
int do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
for (i = 1; i < argc; ++i) {
char *arg;
for (i = 1; i < argc; ++i) {
char *arg;
- arg =
getenv
(argv[i]);
+ arg =
env_get
(argv[i]);
if (arg == NULL) {
printf("## Error: \"%s\" not defined\n", argv[i]);
return 1;
if (arg == NULL) {
printf("## Error: \"%s\" not defined\n", argv[i]);
return 1;
@@
-140,7
+156,7
@@
int do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
bool cli_process_fdt(const char **cmdp)
{
/* Allow the fdt to override the boot command */
bool cli_process_fdt(const char **cmdp)
{
/* Allow the fdt to override the boot command */
- c
har *env = fdtdec_get_config_string(gd->fdt_blob,
"bootcmd");
+ c
onst char *env = ofnode_conf_read_str(
"bootcmd");
if (env)
*cmdp = env;
/*
if (env)
*cmdp = env;
/*
@@
-148,7
+164,7
@@
bool cli_process_fdt(const char **cmdp)
* Always use 'env' in this case, since bootsecure requres that the
* bootcmd was specified in the FDT too.
*/
* Always use 'env' in this case, since bootsecure requres that the
* bootcmd was specified in the FDT too.
*/
- return
fdtdec_get_config_int(gd->fdt_blob, "bootsecure", 0) != 0
;
+ return
ofnode_conf_read_int("bootsecure", 0)
;
}
/*
}
/*
@@
-166,7
+182,9
@@
bool cli_process_fdt(const char **cmdp)
*/
void cli_secure_boot_cmd(const char *cmd)
{
*/
void cli_secure_boot_cmd(const char *cmd)
{
- cmd_tbl_t *cmdtp;
+#ifdef CONFIG_CMDLINE
+ struct cmd_tbl *cmdtp;
+#endif
int rc;
if (!cmd) {
int rc;
if (!cmd) {
@@
-178,6
+196,7
@@
void cli_secure_boot_cmd(const char *cmd)
disable_ctrlc(1);
/* Find the command directly. */
disable_ctrlc(1);
/* Find the command directly. */
+#ifdef CONFIG_CMDLINE
cmdtp = find_cmd(cmd);
if (!cmdtp) {
printf("## Error: \"%s\" not defined\n", cmd);
cmdtp = find_cmd(cmd);
if (!cmdtp) {
printf("## Error: \"%s\" not defined\n", cmd);
@@
-187,6
+206,10
@@
void cli_secure_boot_cmd(const char *cmd)
/* Run the command, forcing no flags and faking argc and argv. */
rc = (cmdtp->cmd)(cmdtp, 0, 1, (char **)&cmd);
/* Run the command, forcing no flags and faking argc and argv. */
rc = (cmdtp->cmd)(cmdtp, 0, 1, (char **)&cmd);
+#else
+ rc = board_run_command(cmd);
+#endif
+
/* Shouldn't ever return from boot command. */
printf("## Error: \"%s\" returned (code %d)\n", cmd, rc);
/* Shouldn't ever return from boot command. */
printf("## Error: \"%s\" returned (code %d)\n", cmd, rc);
@@
-201,18
+224,21
@@
err:
void cli_loop(void)
{
void cli_loop(void)
{
-#ifdef CONFIG_SYS_HUSH_PARSER
+ bootstage_mark(BOOTSTAGE_ID_ENTER_CLI_LOOP);
+#ifdef CONFIG_HUSH_PARSER
parse_file_outer();
/* This point is never reached */
for (;;);
parse_file_outer();
/* This point is never reached */
for (;;);
-#el
se
+#el
if defined(CONFIG_CMDLINE)
cli_simple_loop();
cli_simple_loop();
-#endif /*CONFIG_SYS_HUSH_PARSER*/
+#else
+ printf("## U-Boot command line is disabled. Please enable CONFIG_CMDLINE\n");
+#endif /*CONFIG_HUSH_PARSER*/
}
void cli_init(void)
{
}
void cli_init(void)
{
-#ifdef CONFIG_
SYS_
HUSH_PARSER
+#ifdef CONFIG_HUSH_PARSER
u_boot_hush_start();
#endif
u_boot_hush_start();
#endif