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>
master
Rob Herring 12 years ago committed by Joe Hershberger
parent e6b6ccf203
commit e82eeb5709
  1. 3
      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:

Loading…
Cancel
Save