diff options
| author | Simon Glass <sjg@chromium.org> | 2012-02-14 19:59:20 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-06 21:09:22 +0100 |
| commit | 009dde1955583e306cf904c864068f3acb0db499 (patch) | |
| tree | e947cfb2a3ff47d34c9a78adc97dbd31c97d704e | |
| parent | f47360a74ec05c078960bf6f8c10a7f426c7d11d (diff) | |
| download | u-boot-imx-009dde1955583e306cf904c864068f3acb0db499.zip u-boot-imx-009dde1955583e306cf904c864068f3acb0db499.tar.gz u-boot-imx-009dde1955583e306cf904c864068f3acb0db499.tar.bz2 | |
Rename run_command2() to run_command()
This is a more sensible name, so rename it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | common/cmd_pxe.c | 2 | ||||
| -rw-r--r-- | common/main.c | 10 | ||||
| -rw-r--r-- | include/common.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 7c0cb66..3f69643 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -537,7 +537,7 @@ static int label_localboot(struct pxe_label *label) printf("running: %s\n", dupcmd); - ret = run_command2(dupcmd, 0); + ret = run_command(dupcmd, 0); free(dupcmd); diff --git a/common/main.c b/common/main.c index e74ebdf..797b245 100644 --- a/common/main.c +++ b/common/main.c @@ -270,7 +270,7 @@ int abortboot(int bootdelay) /* * Return 0 on success, or != 0 on error. */ -int run_command2(const char *cmd, int flag) +int run_command(const char *cmd, int flag) { #ifndef CONFIG_SYS_HUSH_PARSER /* @@ -353,7 +353,7 @@ void main_loop (void) int prev = disable_ctrlc(1); /* disable Control C checking */ # endif - run_command2(p, 0); + run_command(p, 0); # ifdef CONFIG_AUTOBOOT_KEYED disable_ctrlc(prev); /* restore Control C checking */ @@ -401,7 +401,7 @@ void main_loop (void) int prev = disable_ctrlc(1); /* disable Control C checking */ # endif - run_command2(s, 0); + run_command(s, 0); # ifdef CONFIG_AUTOBOOT_KEYED disable_ctrlc(prev); /* restore Control C checking */ @@ -412,7 +412,7 @@ void main_loop (void) if (menukey == CONFIG_MENUKEY) { s = getenv("menucmd"); if (s) - run_command2(s, 0); + run_command(s, 0); } #endif /* CONFIG_MENUKEY */ #endif /* CONFIG_BOOTDELAY */ @@ -1422,7 +1422,7 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) return 1; } - if (run_command2(arg, flag) != 0) + if (run_command(arg, flag) != 0) return 1; } return 0; diff --git a/include/common.h b/include/common.h index dd1b9ed..e8b62a9 100644 --- a/include/common.h +++ b/include/common.h @@ -261,7 +261,7 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen); /* common/main.c */ void main_loop (void); int builtin_run_command(const char *cmd, int flag); -int run_command2(const char *cmd, int flag); +int run_command(const char *cmd, int flag); int readline (const char *const prompt); int readline_into_buffer(const char *const prompt, char *buffer, int timeout); |