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
fea8f80
..
a7e3d84
100644
(file)
--- a/
common/cli.c
+++ b/
common/cli.c
@@
-9,13
+9,17
@@
*/
#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>
-
-DECLARE_GLOBAL_DATA_PTR;
+#include <asm/global_data.h>
+#include <dm/ofnode.h>
#ifdef CONFIG_CMDLINE
/*
#ifdef CONFIG_CMDLINE
/*
@@
-23,7
+27,7
@@
DECLARE_GLOBAL_DATA_PTR;
*
* @param cmd Command to run
* @param flag Execution flags (CMD_FLAG_...)
*
* @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)
{
@@
-50,7
+54,7
@@
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)
{
@@
-68,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)
@@
-118,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;
@@
-145,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;
/*
@@
-153,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)
;
}
/*
}
/*
@@
-172,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;
@@
-213,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 */