V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Rob Herring 2012-12-02 21:00:25 -06:00 committed by Joe Hershberger
parent e6b6ccf203
commit e82eeb5709
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/cmd_pxe.c
View File

@ -1155,6 +1155,7 @@ static int parse_pxefile_top(char *p, struct pxe_menu *cfg, int nest_level)
err = 0; err = 0;
switch (t.type) { switch (t.type) {
case T_MENU: case T_MENU:
cfg->prompt = 1;
err = parse_menu(&p, cfg, b, nest_level); err = parse_menu(&p, cfg, b, nest_level);
break; break;
@ -1184,7 +1185,7 @@ static int parse_pxefile_top(char *p, struct pxe_menu *cfg, int nest_level)
break; break;
case T_PROMPT: case T_PROMPT:
err = parse_integer(&p, &cfg->prompt); eol_or_eof(&p);
break; break;
case T_EOL: case T_EOL: