projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sandbox: drop CONFIG_SYS_RELOC_GD_ENV_ADDR
[oweals/u-boot.git]
/
common
/
cli.c
diff --git
a/common/cli.c
b/common/cli.c
index 67ceb635a67776ef3315e156e5b9e40836a2c1a6..6635ab2bcf85186fd57292c7176896d09443dbed 100644
(file)
--- a/
common/cli.c
+++ b/
common/cli.c
@@
-9,12
+9,14
@@
*/
#include <common.h>
*/
#include <common.h>
+#include <bootstage.h>
#include <cli.h>
#include <cli_hush.h>
#include <command.h>
#include <console.h>
#include <env.h>
#include <fdtdec.h>
#include <cli.h>
#include <cli_hush.h>
#include <command.h>
#include <console.h>
#include <env.h>
#include <fdtdec.h>
+#include <hang.h>
#include <malloc.h>
DECLARE_GLOBAL_DATA_PTR;
#include <malloc.h>
DECLARE_GLOBAL_DATA_PTR;
@@
-70,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)
@@
-120,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;
@@
-174,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;