summaryrefslogtreecommitdiff
path: root/common/cmd_bootm.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-02-14 19:59:21 +0000
committerWolfgang Denk <wd@denx.de>2012-03-06 21:09:26 +0100
commit5307153236caaf2304e578c148e00a4b65cb8604 (patch)
tree6c15ac7b41232fd580a2a2ff75ee5bdee76a20e7 /common/cmd_bootm.c
parent009dde1955583e306cf904c864068f3acb0db499 (diff)
downloadu-boot-imx-5307153236caaf2304e578c148e00a4b65cb8604.zip
u-boot-imx-5307153236caaf2304e578c148e00a4b65cb8604.tar.gz
u-boot-imx-5307153236caaf2304e578c148e00a4b65cb8604.tar.bz2
Stop using builtin_run_command()
Boards can select either the 'built-in' parser or the hush parser. We should not call builtin_run_command() if we are using the hush parser. We use run_command() instead, since it knows how to call the correct parser. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common/cmd_bootm.c')
-rw-r--r--common/cmd_bootm.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 2e3e159..6bfef62 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -1045,14 +1045,8 @@ int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int rcode = 0;
-#ifndef CONFIG_SYS_HUSH_PARSER
- if (builtin_run_command(getenv("bootcmd"), flag) < 0)
+ if (run_command(getenv("bootcmd"), flag) < 0)
rcode = 1;
-#else
- if (parse_string_outer(getenv("bootcmd"),
- FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP) != 0)
- rcode = 1;
-#endif
return rcode;
}