[SL-UP] Modifying the lwip opts for the lwip (#582)

Co-authored-by: Mathieu Kardous <[email protected]>

Author: chirag-silabs

src/lwip/silabs/lwipopts-rs911x.h

@@ -123,12 +123,12 @@
 #define LWIP_ETHERNET (LWIP_IPV6) // Required for IPV6 only mode
 #define LWIP_IPV6_MLD (LWIP_IPV6)
 #define LWIP_ICMP6 (LWIP_IPV6)
-#define LWIP_IPV6_REASS (LWIP_IPV6)
 #define LWIP_IPV6_FRAG (LWIP_IPV6)
-#define LWIP_IPV6_DHCP6 0
 #define LWIP_IPV6_AUTOCONFIG (LWIP_IPV6)
-#define LWIP_IPV6_DUP_DETECT_ATTEMPTS 1
 #define LWIP_IPV6_ROUTER_SUPPORT (LWIP_IPV6)
+#define LWIP_IPV6_REASS 0
+#define LWIP_IPV6_DHCP6 0
+#define LWIP_IPV6_DUP_DETECT_ATTEMPTS 1
 #define LWIP_ND6_LISTEN_RA (LWIP_IPV6_ND)
 #define LWIP_ND6_NUM_NEIGHBORS (10)
 #define LWIP_ND6_NUM_DESTINATIONS (10)
@@ -173,6 +173,7 @@
 #define DEFAULT_TCP_RECVMBOX_SIZE 6
 
 #if SL_ICD_ENABLED
+#define SL_LWIP_ECO_TIMERS 1
 #define SL_LWIP_MLD6_TIMERS_ONDEMAND 1
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 

src/lwip/silabs/lwipopts-wf200.h

@@ -125,12 +125,12 @@
 #define LWIP_ETHERNET (LWIP_IPV6) // Required for IPV6 only mode
 #define LWIP_IPV6_MLD (LWIP_IPV6)
 #define LWIP_ICMP6 (LWIP_IPV6)
-#define LWIP_IPV6_REASS (LWIP_IPV6)
 #define LWIP_IPV6_FRAG (LWIP_IPV6)
-#define LWIP_IPV6_DHCP6 0
 #define LWIP_IPV6_AUTOCONFIG (LWIP_IPV6)
-#define LWIP_IPV6_DUP_DETECT_ATTEMPTS 1
 #define LWIP_IPV6_ROUTER_SUPPORT (LWIP_IPV6)
+#define LWIP_IPV6_REASS 0
+#define LWIP_IPV6_DHCP6 0
+#define LWIP_IPV6_DUP_DETECT_ATTEMPTS 1
 #define LWIP_ND6_LISTEN_RA (LWIP_IPV6_ND)
 #define LWIP_ND6_NUM_NEIGHBORS (10)
 #define LWIP_ND6_NUM_DESTINATIONS (10)
@@ -175,6 +175,7 @@
 #define DEFAULT_TCP_RECVMBOX_SIZE 6
 
 #if SL_ICD_ENABLED
+#define SL_LWIP_ECO_TIMERS 1
 #define SL_LWIP_MLD6_TIMERS_ONDEMAND 1
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 

third_party/silabs/lwip.gni

@@ -15,12 +15,21 @@ import("//build_overrides/efr32_sdk.gni")
 import("//build_overrides/lwip.gni")
 import("${silabs_sdk_build_root}/efr32_sdk.gni")
 
+declare_args() {
+  # Use LwIP from SiSDK if true, otherwise use the modified version from Matter Support.
+  sl_use_sisdk_lwip = true
+}
+
 # Defines a lwIP build target.
 #
 # lwIP depends on external header files to compile. This template defines
 # a combined build of the lwIP sources plus target configuration.
 template("lwip_target") {
-  _lwip_root = "${efr32_sdk_root}/util/third_party/lwip/lwip"
+  if (sl_use_sisdk_lwip) {
+    _lwip_root = "${efr32_sdk_root}/util/third_party/lwip/lwip"
+  } else {
+    _lwip_root = "${matter_support_root}/sdk-copies/lwip"
+  }
 
   lwip_target_name = target_name