summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMenon, Nishanth <x0nishan@ti.com>2008-05-12 15:55:55 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2008-05-12 15:55:55 +0200
commitd0054356090f0b55e22c28af2bef3f71e0cee1e7 (patch)
treea3304df99812fb47f8fe609c50904794f836ea85 /common
parent22d3dc0d272c7294bfac2eb09f1b75c9622299b3 (diff)
downloadbarebox-d0054356090f0b55e22c28af2bef3f71e0cee1e7.tar.gz
barebox-d0054356090f0b55e22c28af2bef3f71e0cee1e7.tar.xz
Remove part #ifdefed with #if (CONFIG_COMMANDS & CFG_CMD_BOOTD) which is
false everytime
Diffstat (limited to 'common')
-rw-r--r--common/parser.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/common/parser.c b/common/parser.c
index 1734e30f61..c43d7ca176 100644
--- a/common/parser.c
+++ b/common/parser.c
@@ -2,7 +2,7 @@
#include <command.h>
#include <environment.h>
-int parse_line (char *line, char *argv[])
+static int parse_line (char *line, char *argv[])
{
int nargs = 0;
@@ -265,22 +265,6 @@ int run_command (const char *cmd, int flag)
continue;
}
-#if (CONFIG_COMMANDS & CFG_CMD_BOOTD)
- /* avoid "bootd" recursion */
- if (cmdtp->cmd == do_bootd) {
-#ifdef DEBUG_PARSER
- printf ("[%s]\n", finaltoken);
-#endif
- if (flag & CMD_FLAG_BOOTD) {
- puts ("'bootd' recursion detected\n");
- rc = -1;
- continue;
- } else {
- flag |= CMD_FLAG_BOOTD;
- }
- }
-#endif /* CFG_CMD_BOOTD */
-
/* OK - call function to do the command */
if ((cmdtp->cmd) (cmdtp, argc, argv) != 0)
rc = -1;