From: Rob Herring Date: Sun, 2 Dec 2012 21:00:25 -0600 Subject: [U-Boot] [PATCH 06/10] pxe: always display a menu when present In-Reply-To: <1354503629-25621-1-git-send-email-robherring2@gmail.com> References: <1354503629-25621-1-git-send-email-robherring2@gmail.com> Message-ID: <1354503629-25621-7-git-send-email-robherring2@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Rob Herring 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 --- common/cmd_pxe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index cad5d36..85a27e0 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -1154,6 +1154,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; @@ -1183,7 +1184,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: -- 1.7.10.4