提交 288b29e4 编写于 作者: S Simon Glass 提交者: Tom Rini

common: Move command functions out of common.h

Move these functions into the command.h header file which is a better fit.
Signed-off-by: NSimon Glass <sjg@chromium.org>
Reviewed-by: NTom Rini <trini@konsulko.com>
上级 36bf446b
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <env.h> #include <env.h>
#include <netdev.h> #include <netdev.h>
#include <asm/cache.h> #include <asm/cache.h>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <errno.h> #include <errno.h>
#include <os.h> #include <os.h>
#include <cli.h> #include <cli.h>
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <env.h> #include <env.h>
#include <mmc.h> #include <mmc.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <env.h> #include <env.h>
#include <tpm-v1.h> #include <tpm-v1.h>
#include <malloc.h> #include <malloc.h>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#endif #endif
#include <common.h> #include <common.h>
#include <command.h>
#include <dm.h> #include <dm.h>
#include <env.h> #include <env.h>
#include <malloc.h> #include <malloc.h>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
* Copyright (C) 2016 Grinn * Copyright (C) 2016 Grinn
*/ */
#include <command.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/iomux.h> #include <asm/arch/iomux.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <env.h> #include <env.h>
#include <lcd.h> #include <lcd.h>
#include <libtizen.h> #include <libtizen.h>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <autoboot.h> #include <autoboot.h>
#include <bootretry.h> #include <bootretry.h>
#include <cli.h> #include <cli.h>
#include <command.h>
#include <console.h> #include <console.h>
#include <env.h> #include <env.h>
#include <fdtdec.h> #include <fdtdec.h>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <common.h> #include <common.h>
#include <cli.h> #include <cli.h>
#include <cli_hush.h> #include <cli_hush.h>
#include <command.h>
#include <console.h> #include <console.h>
#include <env.h> #include <env.h>
#include <fdtdec.h> #include <fdtdec.h>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <common.h> #include <common.h>
#include <bootretry.h> #include <bootretry.h>
#include <cli.h> #include <cli.h>
#include <command.h>
#include <console.h> #include <console.h>
#include <env.h> #include <env.h>
#include <linux/ctype.h> #include <linux/ctype.h>
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <common.h> #include <common.h>
#include <autoboot.h> #include <autoboot.h>
#include <cli.h> #include <cli.h>
#include <command.h>
#include <console.h> #include <console.h>
#include <env.h> #include <env.h>
#include <version.h> #include <version.h>
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <common.h> #include <common.h>
#include <bmp_layout.h> #include <bmp_layout.h>
#include <command.h>
#include <env.h> #include <env.h>
#include <errno.h> #include <errno.h>
#include <fs.h> #include <fs.h>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <env.h> #include <env.h>
#include <fastboot.h> #include <fastboot.h>
#include <fastboot-internal.h> #include <fastboot-internal.h>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <env.h> #include <env.h>
#include <fastboot.h> #include <fastboot.h>
#include <net/fastboot.h> #include <net/fastboot.h>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <malloc.h> #include <malloc.h>
#include <nand.h> #include <nand.h>
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <malloc.h> #include <malloc.h>
#include <nand.h> #include <nand.h>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
* Copyright 2017-2018 NXP * Copyright 2017-2018 NXP
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <cpu_func.h> #include <cpu_func.h>
#include <env.h> #include <env.h>
#include <errno.h> #include <errno.h>
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* Sanghee Kim <sh0130.kim@samsung.com> * Sanghee Kim <sh0130.kim@samsung.com>
*/ */
#include <command.h>
#include <errno.h> #include <errno.h>
#include <common.h> #include <common.h>
#include <console.h> #include <console.h>
......
...@@ -199,6 +199,22 @@ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size); ...@@ -199,6 +199,22 @@ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size);
* @return 0 if OK, 1 for error * @return 0 if OK, 1 for error
*/ */
int board_run_command(const char *cmdline); int board_run_command(const char *cmdline);
int run_command(const char *cmd, int flag);
int run_command_repeatable(const char *cmd, int flag);
/**
* Run a list of commands separated by ; or even \0
*
* Note that if 'len' is not -1, then the command does not need to be nul
* terminated, Memory will be allocated for the command in that case.
*
* @param cmd List of commands to run, each separated bu semicolon
* @param len Length of commands excluding terminator if known (-1 if not)
* @param flag Execution flags (CMD_FLAG_...)
* @return 0 on success, or != 0 on error.
*/
int run_command_list(const char *cmd, int len, int flag);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
/* /*
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Common header file for U-Boot * Common header file for U-Boot
* *
* This file still includes quite a bit of stuff that should be in separate * This file still includes quite a bit of stuff that should be in separate
* headers like command.h. Please think before adding more things. * headers. Please think before adding more things.
* Patches to remove things are welcome. * Patches to remove things are welcome.
* *
* (C) Copyright 2000-2009 * (C) Copyright 2000-2009
...@@ -66,21 +66,6 @@ void hang (void) __attribute__ ((noreturn)); ...@@ -66,21 +66,6 @@ void hang (void) __attribute__ ((noreturn));
/* common/main.c */ /* common/main.c */
void main_loop (void); void main_loop (void);
int run_command(const char *cmd, int flag);
int run_command_repeatable(const char *cmd, int flag);
/**
* Run a list of commands separated by ; or even \0
*
* Note that if 'len' is not -1, then the command does not need to be nul
* terminated, Memory will be allocated for the command in that case.
*
* @param cmd List of commands to run, each separated bu semicolon
* @param len Length of commands excluding terminator if known (-1 if not)
* @param flag Execution flags (CMD_FLAG_...)
* @return 0 on success, or != 0 on error.
*/
int run_command_list(const char *cmd, int len, int flag);
int checkflash(void); int checkflash(void);
int checkdram(void); int checkdram(void);
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#define DEBUG #define DEBUG
#include <common.h> #include <common.h>
#include <command.h>
static const char test_cmd[] = "setenv list 1\n setenv list ${list}2; " static const char test_cmd[] = "setenv list 1\n setenv list ${list}2; "
"setenv list ${list}3\0" "setenv list ${list}3\0"
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <dm.h> #include <dm.h>
#include <fdtdec.h> #include <fdtdec.h>
#include <mapmem.h> #include <mapmem.h>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册