From: Tom Rini <trini@konsulko.com>
Date: Wed, 3 Jan 2024 14:22:47 +0000 (-0500)
Subject: Merge tag 'v2024.01-rc6' into next
X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/git-favicon.png?a=commitdiff_plain;h=93a0138acbe029fba1d1255cc0b9b8700b49bdff;p=u-boot.git

Merge tag 'v2024.01-rc6' into next

Prepare v2024.01-rc6
---

93a0138acbe029fba1d1255cc0b9b8700b49bdff
diff --cc net/wget.c
index 6ae2237a0a,e1e580c835..817c5ebd5d
--- a/net/wget.c
+++ b/net/wget.c
@@@ -15,10 -13,10 +15,13 @@@
  #include <net.h>
  #include <net/tcp.h>
  #include <net/wget.h>
 +#include <stdlib.h>
 +
 +DECLARE_GLOBAL_DATA_PTR;
  
+ /* The default, change with environment variable 'httpdstp' */
+ #define SERVER_PORT		80
+ 
  static const char bootfile1[] = "GET ";
  static const char bootfile3[] = " HTTP/1.0\r\n\r\n";
  static const char http_eom[] = "\r\n\r\n";