Sync csa-v1.5-branch branch with release_2.8-1.5

.github/.wordlist.txt

@@ -910,6 +910,7 @@ mcumgr
 MCUs
 mcux
 MCUXpresso
+MCXW
 mdash
 MDNS
 MediaInput

.github/workflows/examples-nxp.yaml

@@ -73,21 +73,21 @@ jobs:
               run: |
                   scripts/run_in_build_env.sh "\
                       ./scripts/build/build_examples.py \
-                      --target nxp-mcxw71-freertos-contact-sensor-thread-mtd-low-power-cmake-frdm \
+                      --target nxp-mcxw71-freertos-contact-sensor-thread-mtd-low-power-frdm \
                       build \
                   "
             - name: Get MCXW71 contact sensor size stats
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nxp mcxw71+release contact \
-                    out/nxp-mcxw71-freertos-contact-sensor-thread-mtd-low-power-cmake-frdm/app.elf \
+                    out/nxp-mcxw71-freertos-contact-sensor-thread-mtd-low-power-frdm/app.elf \
                     /tmp/bloat_reports/
 
             - name: Build MCXW72 examples
               run: |
                   scripts/run_in_build_env.sh "\
                       ./scripts/build/build_examples.py \
-                      --target nxp-mcxw72-freertos-contact-sensor-thread-mtd-low-power-cmake-frdm \
+                      --target nxp-mcxw72-freertos-contact-sensor-thread-mtd-low-power-frdm \
                       build \
                   "
 
@@ -101,7 +101,7 @@ jobs:
               run: |
                   scripts/run_in_build_env.sh "\
                       ./scripts/build/build_examples.py \
-                      --target nxp-rt1060-freertos-thermostat-thread-wifi-ota-evkc-iwx12-cmake \
+                      --target nxp-rt1060-freertos-thermostat-thread-wifi-ota-evkc-iwx12 \
                       build \
                   "
 
@@ -115,7 +115,7 @@ jobs:
               run: |
                   scripts/run_in_build_env.sh "\
                       ./scripts/build/build_examples.py \
-                      --target nxp-rt1170-freertos-thermostat-thread-wifi-ota-iwx12-cmake \
+                      --target nxp-rt1170-freertos-thermostat-thread-wifi-ota-iwx12 \
                       build \
                   "
 
@@ -126,15 +126,15 @@ jobs:
               run: |
                   scripts/run_in_build_env.sh "\
                       ./scripts/build/build_examples.py \
-                      --target nxp-rw61x-freertos-thermostat-thread-wifi-ota-factory-cmake \
-                      --target nxp-rw61x-freertos-thermostat-wifi-se05x-cmake \
+                      --target nxp-rw61x-freertos-thermostat-thread-wifi-ota-factory \
+                      --target nxp-rw61x-freertos-thermostat-wifi-se05x \
                       build \
                   "
             - name: Build RW61X thermostat ethernet example app
               run: |
                   scripts/run_in_build_env.sh "\
                       ./scripts/build/build_examples.py \
-                      --target nxp-rw61x-freertos-thermostat-ethernet-cmake-frdm \
+                      --target nxp-rw61x-freertos-thermostat-ethernet-frdm \
                       build \
                   "
 

config/esp32/args.gni

@@ -26,7 +26,6 @@ lwip_platform = "external"
 
 #Enabling this causes some error
 #chip_inet_config_enable_tun_endpoint = false
-chip_inet_config_enable_tcp_endpoint = false
 chip_inet_config_enable_udp_endpoint = true
 
 chip_config_memory_management = "platform"

config/esp32/components/chip/CMakeLists.txt

@@ -121,6 +121,12 @@ if(CONFIG_DISABLE_IPV4)
     endif()
 endif()
 
+if(CONFIG_ENABLE_TCP_TRANSPORT)
+    chip_gn_arg_append("chip_inet_config_enable_tcp_endpoint" "true")
+else()
+    chip_gn_arg_append("chip_inet_config_enable_tcp_endpoint" "false")
+endif()
+
 if(CONFIG_DISABLE_READ_CLIENT)
     chip_gn_arg_append("chip_enable_read_client"             "false")
 endif()
@@ -135,7 +141,15 @@ if(CONFIG_ENABLE_ICD_SERVER)
         chip_gn_arg_append("chip_icd_report_on_active_mode"               "true")
     endif()
     if(CONFIG_ENABLE_ICD_LIT)
-        chip_gn_arg_append("chip_enable_icd_lit"               "true")
+        chip_gn_arg_append("chip_enable_icd_lit"                        "true")
+        chip_gn_arg_append("chip_enable_icd_checkin"                    "true")
+        chip_gn_arg_append("chip_enable_icd_user_active_mode_trigger"   "true")
+        if (CONFIG_ENABLE_ICD_DSLS)
+            chip_gn_arg_append("chip_enable_icd_dsls"           "true")
+        else()
+            chip_gn_arg_append("chip_enable_icd_dsls"           "false")
+        endif()
+    else()
         if(CONFIG_ENABLE_ICD_CIP)
             chip_gn_arg_append("chip_enable_icd_checkin"               "true")
         else()

config/esp32/components/chip/Kconfig

@@ -32,7 +32,7 @@ menu "CHIP Core"
             default 8
             help
                 The maximum number of simultaneously active CHIP exchange contexts.
-                                           
+
                 An exchange context object is used to track the state of an ongoing CHIP message
                 exchange (conversation) with a peer, e.g. a cloud service, a mobile application, or
                 another device.
@@ -257,6 +257,14 @@ menu "CHIP Core"
                 Here, we are also enabling LWIP_CHECK_THREAD_SAFETY which will assert when
                 LwIP code gets called from any other context or without holding the LwIP lock.
 
+        config USE_LWIP_PBUF_RAM_PACKETBUFFER
+            bool "Use lwIP PBUF_RAM type for CHIP packet buffer"
+            default n
+            help
+                Enable this option to use lwIP PBUF_RAM type for CHIP packet buffer. Configure via
+                MAX_LARGE_BUFFER_SIZE_BYTES to support larger packets exceeding IPv6 MTU.
+                If not enabled, CHIP will use lwIP PBUF_POOL type for packet buffer.
+
     endmenu # "Networking Options"
 
     menu "System Options"
@@ -285,8 +293,8 @@ menu "CHIP Core"
             depends on ENABLE_OTA_REQUESTOR
             default n
             help
-                Enable this option for delta OTA image updates. 
-                Delta OTA updates allow for smaller, more efficient updates by only 
+                Enable this option for delta OTA image updates.
+                Delta OTA updates allow for smaller, more efficient updates by only
                 sending the changes between the current and new firmware versions.
 
         config OTA_AUTO_REBOOT_ON_APPLY
@@ -447,12 +455,22 @@ menu "CHIP Device Layer"
             bool "Enable Long Idle Time ICD"
             depends on ENABLE_ICD_SERVER
             default n
+            select ENABLE_ICD_CIP
+            select ENABLE_ICD_USER_ACTIVE_MODE_TRIGGER
             help
                 Enables or Disables LIT ICD
 
+        config ENABLE_ICD_DSLS
+            bool "Enable Dynamic SIT LIT Support"
+            depends on ENABLE_ICD_LIT
+            default y
+            help
+                Enables or Disables dynamic switching from SIT to LIT operating modes.
+
+
         config ENABLE_ICD_CIP
             bool "Enable Check-in protocol"
-            depends on ENABLE_ICD_LIT
+            depends on ENABLE_ICD_SERVER
             default y
             help
                 Enables or Disables ICD Check-in protocol
@@ -480,12 +498,12 @@ menu "CHIP Device Layer"
 
         config ENABLE_ICD_USER_ACTIVE_MODE_TRIGGER
             bool "Enable User Active Mode Trigger feature"
-            depends on ENABLE_ICD_LIT
+            depends on ENABLE_ICD_SERVER
             default y
             help
                 Enables or Disables ICD User Active Mode Trigger feature
 
-        config ENABLE_BG_EVENT_PROCESSING
+        menuconfig ENABLE_BG_EVENT_PROCESSING
             bool "Enable Background event processing"
             default n
             help
@@ -1214,6 +1232,23 @@ menu "CHIP Device Layer"
 
     endmenu
 
+    menu "Matter TCP transport options"
+        config ENABLE_TCP_TRANSPORT
+            bool "Enable TCP transport"
+            select USE_LWIP_PBUF_RAM_PACKETBUFFER
+            default n
+            help
+                Enable TCP transport. If enabled, USE_LWIP_PBUF_RAM_PACKETBUFFER must be configured.
+
+        config MAX_LARGE_BUFFER_SIZE_BYTES
+            int "Max buffer size for TCP payloads"
+            depends on ENABLE_TCP_TRANSPORT
+            default 1530
+            help
+                Max TCP payload buffer size.
+
+    endmenu
+
     menu "Network Commissioning Driver Endpoint Id"
         config THREAD_NETWORK_COMMISSIONING_DRIVER
             bool "Use the generic Thread network commissioning driver"

config/nrfconnect/chip-module/Kconfig

@@ -300,14 +300,6 @@ config CHIP_FACTORY_RESET_ERASE_SETTINGS
 	default y
 	depends on NVS || ZMS
 
-config CHIP_LOG_SIZE_OPTIMIZATION
-	bool "Disable some detailed logs to decrease flash usage"
-	help
-	  Disables some log levels for specific Matter log modules that provide
-	  information that is too detailed to be used in most cases. You can find
-	  full configuration enabled by this option in the
-	  platform/nrfconnect/CHIPPlatformConfig.h file.
-
 config CHIP_IPV4
 	bool "IPv4 support for Matter"
 	default n

config/nxp/chip-module/Kconfig

@@ -203,14 +203,6 @@ config CHIP_FACTORY_RESET_ERASE_SETTINGS
 
 endif
 
-config CHIP_LOG_SIZE_OPTIMIZATION
-	bool "Disable some detailed logs to decrease flash usage"
-	help
-	  Disables some log levels for specific Matter log modules that provide
-	  information that is too detailed to be used in most cases. You can find
-	  full configuration enabled by this option in the
-	  platform/nxp/CHIPPlatformConfig.h file.
-
 config CHIP_IPV4
 	bool "IPv4 support for Matter"
 	default n

config/nxp/chip-module/Kconfig.defaults

@@ -23,6 +23,29 @@ if CHIP
 config CHIP_OPERATIONAL_TIME_SAVE_INTERVAL
 	default 1
 
+config CHIP_ENABLE_WIFI_STATION
+    default y if CHIP_WIFI
+
+config CHIP_SYSTEM_THREAD_LOCAL_STORAGE
+	default n
+
+config CHIP_SYSTEM_USE_ZEPHYR_SOCKET_EXTENSIONS
+	default n
+
+config CHIP_TASK_PRIORITY
+	default 5
+
+config MAX_EVENT_QUEUE_SIZE
+	default 64
+
+config CHIP_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
+	default 800 if NET_L2_OPENTHREAD
+	default 2000
+
+config CHIP_MRP_LOCAL_IDLE_RETRY_INTERVAL
+	default 800 if NET_L2_OPENTHREAD
+	default 2000
+
 if CHIP_FACTORY_DATA
 
 config CHIP_DEVICE_VENDOR_ID

config/nxp/cmake/Kconfig.matter.common

@@ -352,26 +352,13 @@ config CHIP_ICD_IDLE_MODE_DURATION
 	  It determines the maximum amount of time the device can stay in the idle mode, which means the
 	  device may be unreachable and not able to receive messages.
 
-config CHIP_ICD_IDLE_MODE_INTERVAL_MS
-	int "Intermittently Connected Device idle mode interval (ms)"
-	default 2000
-	help
-	  Provides the ICD idle mode interval in milliseconds.
-
-
 config CHIP_ICD_ACTIVE_MODE_DURATION
 	int "Intermittently Connected Device active mode duration (ms)"
 	default 10000
 	help
 	  Provides the Intermittently Connected Device active mode duration in milliseconds.
 	  It determines the minimum amount of time the device shall stay in the active mode.
 
-config CHIP_ICD_ACTIVE_MODE_INTERVAL_MS
-	int "Intermittently Connected Device active mode interval (ms)"
-	default 500
-	help
-	  Provides the ICD active mode interval in milliseconds.
-
 config CHIP_ICD_ACTIVE_MODE_THRESHOLD
 	int "Intermittently Connected Device active mode threshold (ms)"
 	default 5000

config/silabs/Kconfig

@@ -213,14 +213,6 @@ config CHIP_FACTORY_RESET_ERASE_SETTINGS
 	default y
 	depends on NVS || ZMS
 
-config CHIP_LOG_SIZE_OPTIMIZATION
-	bool "Disable some detailed logs to decrease flash usage"
-	help
-	  Disables some log levels for specific Matter log modules that provide
-	  information that is too detailed to be used in most cases. You can find
-	  full configuration enabled by this option in the
-	  platform/silabs/CHIPPlatformConfig.h file.
-
 config CHIP_OPENTHREAD_JOINER_ENABLED
 	bool "Specify whether the Thread Joiner functionality is used when it is enabled"
 	default n

config/telink/chip-module/Kconfig

@@ -196,14 +196,6 @@ config CHIP_FACTORY_RESET_ERASE_SETTINGS
 
 endif
 
-config CHIP_LOG_SIZE_OPTIMIZATION
-	bool "Disable some detailed logs to decrease flash usage"
-	help
-	  Disables some log levels for specific Matter log modules that provide
-	  information that is too detailed to be used in most cases. You can find
-	  full configuration enabled by this option in the
-	  platform/telink/CHIPPlatformConfig.h file.
-
 config CHIP_IPV4
 	bool "IPv4 support for Matter"
 	default n