aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-04-12 13:33:43 -0500
committerJohn Rigby <john.rigby@linaro.org>2012-12-06 13:51:48 -0700
commit2619f51a00a58a184850f308c24a336fd8824fac (patch)
treef1cd0b1c92ce987cd1e764cb14986575f82bc6a1
parent5af2769faee0452d6ee2f111511fe3ac3fb713b2 (diff)
downloadu-boot-linaro-stable-2619f51a00a58a184850f308c24a336fd8824fac.tar.gz
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>
-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 0d0efa441..0e9f8a4bf 100644
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -1175,6 +1175,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;
@@ -1204,7 +1205,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: