Sync with esp82xx-nonos-linklayer (esp8266#9078)

* Update lwip2 builder * Rebuild lwip2 libs
hasenradball · Nov 18, 2024 · 52b74c5 · 52b74c5
1 parent e057168
commit 52b74c5
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 14 deletions.
diff --git a/tools/sdk/lib/liblwip2-1460-feat.a b/tools/sdk/lib/liblwip2-1460-feat.a
diff --git a/tools/sdk/lib/liblwip2-1460.a b/tools/sdk/lib/liblwip2-1460.a
diff --git a/tools/sdk/lib/liblwip2-536-feat.a b/tools/sdk/lib/liblwip2-536-feat.a
diff --git a/tools/sdk/lib/liblwip2-536.a b/tools/sdk/lib/liblwip2-536.a
diff --git a/tools/sdk/lib/liblwip6-1460-feat.a b/tools/sdk/lib/liblwip6-1460-feat.a
diff --git a/tools/sdk/lib/liblwip6-536-feat.a b/tools/sdk/lib/liblwip6-536-feat.a
diff --git a/tools/sdk/lwip2/builder b/tools/sdk/lwip2/builder
diff --git a/tools/sdk/lwip2/include/lwip-git-hash.h b/tools/sdk/lwip2/include/lwip-git-hash.h
@@ -1,5 +1,5 @@
 // generated by makefiles/make-lwip2-hash
 #ifndef LWIP_HASH_H
 #define LWIP_HASH_H
-#define LWIP_HASH_STR "STABLE-2_1_3_RELEASE/glue:1.2-67-g8e3c4ee"
+#define LWIP_HASH_STR "STABLE-2_1_3_RELEASE/glue:1.2-70-g4087efd"
 #endif // LWIP_HASH_H
diff --git a/tools/sdk/lwip2/include/lwipopts.h b/tools/sdk/lwip2/include/lwipopts.h
@@ -3,11 +3,10 @@
 #define __CUSTOM_EXTRA_DEFINES__
 
 #endif
-
 #ifndef MYLWIPOPTS_H
 #define MYLWIPOPTS_H
 
-// opt.h version lwip-2.1.0rc1 for esp8266
+/* opt.h version lwip-2.1.3 for esp8266 */
 
 /**
  * @file
@@ -996,7 +995,7 @@
 #if !LWIP_IPV4
 /* disable AUTOIP when IPv4 is disabled */
 #undef LWIP_AUTOIP
-#define LWIP_AUTOIP 0
+#define LWIP_AUTOIP                     0
 #endif /* !LWIP_IPV4 */
 
 /**
@@ -1564,7 +1563,7 @@
  * LWIP_PBUF_REF_T: Refcount type in pbuf.
  * Default width of u8_t can be increased if 255 refs are not enough for you.
  */
-#ifndef LWIP_PBUF_REF_T
+#if !defined LWIP_PBUF_REF_T || defined __DOXYGEN__
 #define LWIP_PBUF_REF_T                 u8_t
 #endif
 
@@ -2447,7 +2446,7 @@
  * LWIP_IPV6_FORWARD==1: Forward IPv6 packets across netifs
  */
 #if !defined LWIP_IPV6_FORWARD || defined __DOXYGEN__
-#define LWIP_IPV6_FORWARD               0 // 0
+#define LWIP_IPV6_FORWARD               0
 #endif
 
 /**
@@ -2683,7 +2682,7 @@
  * servers to the DNS module.
  */
 #if !defined LWIP_ND6_RDNSS_MAX_DNS_SERVERS || defined __DOXYGEN__
-#define LWIP_ND6_RDNSS_MAX_DNS_SERVERS  0 // 0
+#define LWIP_ND6_RDNSS_MAX_DNS_SERVERS  0
 #endif
 /**
  * @}
@@ -2722,7 +2721,7 @@
  * void dhcp6_set_ntp_servers(u8_t num_ntp_servers, ip_addr_t* ntp_server_addrs);
 */
 #if !defined LWIP_DHCP6_GET_NTP_SRV || defined __DOXYGEN__
-#define LWIP_DHCP6_GET_NTP_SRV          1 // with 1: dhcp6_set_ntp_servers() must be implemented
+#define LWIP_DHCP6_GET_NTP_SRV          1
 #endif
 
 /**
@@ -3509,9 +3508,6 @@
 #if !defined DHCP6_DEBUG || defined __DOXYGEN__
 #define DHCP6_DEBUG                     LWIP_DBG_OFF
 #endif
-/**
- * @}
- */
 
 /**
  * NAPT_DEBUG: Enable debugging for NAPT.
@@ -3520,6 +3516,10 @@
 #define NAPT_DEBUG                       LWIP_DBG_OFF
 #endif
 
+/**
+ * @}
+ */
+
 /**
  * LWIP_TESTMODE: Changes to make unit test possible
  */
@@ -3566,9 +3566,13 @@
 #define PPPOS_SUPPORT       IP_NAPT         // because we don't have proxyarp yet
 #define PPP_SUPPORT         PPPOS_SUPPORT
 #define PPP_SERVER          1
-#define PPP_DEBUG           ULWIPDEBUG
 #define PRINTPKT_SUPPORT    ULWIPDEBUG
 
+#if ULWIPDEBUG
+#define PPP_DEBUG           LWIP_DBG_ON
+#define PING_DEBUG          LWIP_DBG_ON
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3710,4 +3714,4 @@ void tcp_kill_timewait (void);
 } // extern "C"
 #endif
 
-#endif // MYLWIPOPTS_H
+#endif /* MYLWIPOPTS_H */
+1 −6		glue-esp/lwip-esp.c
+16 −12		glue-lwip/arduino/lwipopts.h
+5 −5		glue-lwip/esp-ping.c
+3 −14		glue-lwip/lwip-git.c
+32 −22		glue-lwip/open/lwipopts.h