summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-12-02 21:00:25 -0600
committerJoe Hershberger <joe.hershberger@ni.com>2013-06-24 19:07:34 -0500
commite82eeb57091ea5ed9a25ece50e911cb8e3dd623d (patch)
treeedb5e88f7629e87e86503636780ba935d99770c4 /common
parente6b6ccf203922059a07c6dde1d3198d8abf0ab27 (diff)
downloadu-boot-imx-e82eeb57091ea5ed9a25ece50e911cb8e3dd623d.zip
u-boot-imx-e82eeb57091ea5ed9a25ece50e911cb8e3dd623d.tar.gz
u-boot-imx-e82eeb57091ea5ed9a25ece50e911cb8e3dd623d.tar.bz2
pxe: always display a menu when present
The prompt flag is for displaying a "boot:" prompt in pxelinux. This doesn't make sense for u-boot as we don't support the pxelinux command interface. So we should just ignore prompt statements and always show the menu if a menu is present. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_pxe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
index 4e2811e..6e3fcb2 100644
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -1155,6 +1155,7 @@ static int parse_pxefile_top(char *p, struct pxe_menu *cfg, int nest_level)
err = 0;
switch (t.type) {
case T_MENU:
+ cfg->prompt = 1;
err = parse_menu(&p, cfg, b, nest_level);
break;
@@ -1184,7 +1185,7 @@ static int parse_pxefile_top(char *p, struct pxe_menu *cfg, int nest_level)
break;
case T_PROMPT:
- err = parse_integer(&p, &cfg->prompt);
+ eol_or_eof(&p);
break;
case T_EOL: