From: Manuel Traut <manuel.traut@mt.com>
Date: Fri, 18 Nov 2022 08:00:27 +0000 (+0100)
Subject: distro/pxeboot: Handle prompt variable
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=739e8361f3fe78038251216df6096a32bc2d5839;p=u-boot.git

distro/pxeboot: Handle prompt variable

Regarding the documentation found here:
https://github.com/u-boot/u-boot/blob/master/common/menu.c#L347

If both timeout and prompt is set to 0 the default entry shall
be booted immediately. However the current behaviour is that
the prompt is shown (tested with distroboot) until the user
selects an entry (no timeout).

This change implements a behaviour as documented. It was tested
with distroboot.

Signed-off-by: Manuel Traut <manuel.traut@mt.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c
index c613818d0b..2724313817 100644
--- a/boot/pxe_utils.c
+++ b/boot/pxe_utils.c
@@ -1368,7 +1368,10 @@ static int parse_pxefile_top(struct pxe_context *ctx, char *p, unsigned long bas
 			break;
 
 		case T_PROMPT:
-			eol_or_eof(&p);
+			err = parse_integer(&p, &cfg->prompt);
+			// Do not fail if prompt configuration is undefined
+			if (err <  0)
+				eol_or_eof(&p);
 			break;
 
 		case T_EOL: