From: Rob Herring Date: Mon, 3 Dec 2012 03:00:25 +0000 (-0600) Subject: pxe: always display a menu when present X-Git-Tag: v2013.07-rc2~57^2~28 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e82eeb57091ea5ed9a25ece50e911cb8e3dd623d;p=u-boot 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 --- diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 4e2811e156..6e3fcb2402 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: