From: Simon Glass <sjg@chromium.org>
Date: Thu, 6 Mar 2025 00:25:15 +0000 (-0700)
Subject: net: Keep the bootstage functions together
X-Git-Tag: v2025.07-rc1~18^2~21^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c04afbc957d18e61813315a0694db903754a280;p=pandora-u-boot.git

net: Keep the bootstage functions together

Move the bootstage_mark() function just before net_loop(), so that the
IPv6 code is not in the way.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/cmd/net.c b/cmd/net.c
index 79525f73a51..deebd5b710f 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -413,8 +413,6 @@ static int netboot_common(enum proto_t proto, struct cmd_tbl *cmdtp, int argc,
 		return CMD_RET_USAGE;
 	}
 
-	bootstage_mark(BOOTSTAGE_ID_NET_START);
-
 	if (IS_ENABLED(CONFIG_IPV6) && !use_ip6) {
 		char *s, *e;
 		size_t len;
@@ -428,6 +426,8 @@ static int netboot_common(enum proto_t proto, struct cmd_tbl *cmdtp, int argc,
 		}
 	}
 
+	bootstage_mark(BOOTSTAGE_ID_NET_START);
+
 	size = net_loop(proto);
 	if (size < 0) {
 		bootstage_error(BOOTSTAGE_ID_NET_NETLOOP_OK);