summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-02-14 19:59:18 +0000
committerWolfgang Denk <wd@denx.de>2012-03-06 21:09:14 +0100
commit79714c1e26229985c2ed9dd5853b55732cb21f2c (patch)
tree6430340f550326eee332f346c2f1cd2717aecca2
parentb199c6e2d71c5d1a89dcc66a1215fafcb2156591 (diff)
downloadu-boot-imx-79714c1e26229985c2ed9dd5853b55732cb21f2c.zip
u-boot-imx-79714c1e26229985c2ed9dd5853b55732cb21f2c.tar.gz
u-boot-imx-79714c1e26229985c2ed9dd5853b55732cb21f2c.tar.bz2
Remove CMD_PXE's static on run_command()
It really isn't clear why this is here and there is no comment, so drop it. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--common/main.c3
-rw-r--r--include/common.h2
2 files changed, 0 insertions, 5 deletions
diff --git a/common/main.c b/common/main.c
index 91e888f..defe2d4 100644
--- a/common/main.c
+++ b/common/main.c
@@ -270,9 +270,6 @@ int abortboot(int bootdelay)
/*
* Return 0 on success, or != 0 on error.
*/
-#ifndef CONFIG_CMD_PXE
-static inline
-#endif
int run_command2(const char *cmd, int flag)
{
#ifndef CONFIG_SYS_HUSH_PARSER
diff --git a/include/common.h b/include/common.h
index a2c6b27..8f5331e 100644
--- a/include/common.h
+++ b/include/common.h
@@ -261,9 +261,7 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen);
/* common/main.c */
void main_loop (void);
int run_command (const char *cmd, int flag);
-#ifdef CONFIG_CMD_PXE
int run_command2(const char *cmd, int flag);
-#endif
int readline (const char *const prompt);
int readline_into_buffer(const char *const prompt, char *buffer,
int timeout);