project-chip · mergify · Jan 8, 2025 · Dec 16, 2024 · Dec 23, 2024 · Dec 23, 2024
diff --git a/.github/workflows/examples-nxp.yaml b/.github/workflows/examples-nxp.yaml
@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nxp:94
+            image: ghcr.io/project-chip/chip-build-nxp:96
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -203,7 +203,6 @@ jobs:
                   scripts/run_in_build_env.sh "\
                       ./scripts/build/build_examples.py \
                       --target nxp-rw61x-freertos-all-clusters-wifi \
-                      --target nxp-rw61x-freertos-all-clusters-wifi-ota-cmake \
                       build \
                       --copy-artifacts-to out/artifacts \
                   "

@@ -212,18 +212,10 @@ rt_executable("thermostat") {
   }
 
   if (chip_enable_ota_requestor) {
+    include_dirs += [ "${common_example_dir}/ota_requestor/include" ]
     sources += [
-      "${chip_root}/examples/platform/nxp/common/mcuboot_app_support/flash_partitioning.h",
       "${common_example_dir}/ota_requestor/source/OTARequestorInitiator.cpp",
       "${common_example_dir}/ota_requestor/source/OTARequestorInitiatorCommon.cpp",
-
-      #Adding mcuboot files
-      "${chip_root}/examples/platform/nxp/common/mcuboot_app_support/mcuboot_app_support.c",
-      "${chip_root}/examples/platform/nxp/common/mcuboot_app_support/mcuboot_app_support.h",
-    ]
-    include_dirs += [
-      "$${common_example_dir}/ota_requestor/include",
-      "${chip_root}/examples/platform/nxp/common/mcuboot_app_support",
     ]
   }
 
@@ -291,6 +283,9 @@ rt_executable("thermostat") {
     "-Wl,--no-warn-rwx-segments",
   ]
 
+  if (evkname == "evkcmimxrt1060") {
+    ldflags += [ "-Wl,--defsym=gEVKCFlashSize_d=0x1000000" ]
+  }
   if (enable_ota_provider) {
     # As the OTA file will be stored in the littlefs file system, it is required to increase the size of the file system
     # To be able to store an OTA file with a MAX size of 640K,
@@ -305,7 +300,7 @@ rt_executable("thermostat") {
     # we would need to reserve enough space for the bootloader (MCUBoot)
     # MCUBoot requires 0x11000 Bytes to be reserved at the base of the flash
     # Consequently, some sections will need to be shifted
-    ldflags += [ "-Wl,--defsym=__mcu_boot_size__=0x11000" ]
+    ldflags += [ "-Wl,--defsym=__m_mcuboot_size__=0x40000" ]
   }
 
   output_dir = root_out_dir

@@ -75,12 +75,6 @@ using namespace ::chip::System;
 using namespace ::chip::DeviceLayer::Internal;
 using namespace ::chip::DeviceLayer::DeviceEventType;
 
-#if !SDK_2_16_100
-// Table 9-50 "Status codes" of IEEE 802.11-2020: Unspecified failure
-// Temporary default status code before SDK API to map wlan_event_reason to IEEE Status codes
-#define WLAN_REFUSED_REASON_UNSPECIFIED 1
-#endif
-
 namespace chip {
 namespace DeviceLayer {
 
@@ -244,12 +238,7 @@ void ConnectivityManagerImpl::ProcessWlanEvent(enum wlan_event_reason wlanEvent)
     WiFiDiagnosticsDelegate * delegate = GetDiagnosticDataProvider().GetWiFiDiagnosticsDelegate();
     uint8_t associationFailureCause =
         chip::to_underlying(chip::app::Clusters::WiFiNetworkDiagnostics::AssociationFailureCauseEnum::kUnknown);
-
-#if SDK_2_16_100
     uint16_t wlan_status_code = wlan_get_status_code(wlanEvent);
-#else
-    uint16_t wlan_status_code = WLAN_REFUSED_REASON_UNSPECIFIED;
-#endif
 
 #if CHIP_DETAIL_LOGGING
     enum wlan_connection_state state;

@@ -67,20 +67,16 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
     CHIP_ERROR GetWiFiPacketMulticastTxCount(uint32_t & packetMulticastTxCount) override;
     CHIP_ERROR GetWiFiPacketUnicastTxCount(uint32_t & packetUnicastTxCount) override;
     CHIP_ERROR ResetWiFiNetworkDiagnosticsCounts() override;
-#if SDK_2_16_100
     CHIP_ERROR GetWiFiOverrunCount(uint64_t & overrunCount) override;
     CHIP_ERROR GetWiFiPacketUnicastRxCount(uint32_t & packetUnicastTxCount) override;
-#endif
 
     uint32_t mBeaconRxCount          = 0;
     uint32_t mBeaconLostCount        = 0;
     uint32_t mPacketMulticastRxCount = 0;
     uint32_t mPacketMulticastTxCount = 0;
     uint32_t mPacketUnicastTxCount   = 0;
-#if SDK_2_16_100
-    uint32_t mPacketUnicastRxCount = 0;
-    uint64_t mOverrunCount         = 0;
-#endif
+    uint32_t mPacketUnicastRxCount   = 0;
+    uint64_t mOverrunCount           = 0;
 #endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA */
 };
 

@@ -21,7 +21,10 @@
 #include <platform/CHIPDeviceError.h>
 #include <platform/internal/testing/ConfigUnitTest.h>
 #include <platform/nxp/common/CHIPDeviceNXPPlatformDefaultConfig.h>
+
+extern "C" {
 #include <settings.h>
+}
 
 /* Only for flash init, to be move to sdk framework */
 #include "nvs_port.h"

@@ -49,6 +49,11 @@
 #include <setup_payload/AdditionalDataPayloadGenerator.h>
 #endif
 
+// Temporarily keep backwards compatibility. To be removed
+#ifndef CONFIG_CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_TIMEOUT
+#define CONFIG_CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_TIMEOUT CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_TIMEOUT
+#endif
+
 /*******************************************************************************
  * Local data types
  *******************************************************************************/

@@ -172,10 +172,6 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t
         err              = GetValStorage(key)->Read(pdmInternalId, 0, (uint8_t *) value, &valueSize);
         *read_bytes_size = valueSize;
     }
-    else
-    {
-        ChipLogProgress(DeviceLayer, "KVS key [%s] not found in persistent storage.", key);
-    }
 
 exit:
     ConvertError(err);
@@ -214,16 +210,8 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Put(const char * key, const void * value,
             ChipLogProgress(DeviceLayer, "KVS key: set [%s][%i][%s]", key, pdmInternalId, GetKeyStorage(key)->GetName());
 
             err = GetKeyStorage(key)->Write(pdmInternalId, (uint8_t *) key, strlen(key) + 1);
-            if (err != CHIP_NO_ERROR)
-            {
-                ChipLogProgress(DeviceLayer, "KVS key: error when setting [%s][%i]", key, pdmInternalId);
-            }
         }
     }
-    else
-    {
-        ChipLogProgress(DeviceLayer, "KVS val: error when setting [%s][%i]", key, pdmInternalId);
-    }
 
 exit:
     ConvertError(err);
@@ -255,14 +243,6 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
             ChipLogProgress(DeviceLayer, "KVS val: del [%s][%i][%s]", key, pdmInternalId, GetValStorage(key)->GetName());
 
             err = GetValStorage(key)->Delete(pdmInternalId, -1);
-            if (err != CHIP_NO_ERROR)
-            {
-                ChipLogProgress(DeviceLayer, "KVS val: error when deleting [%s][%i]", key, pdmInternalId);
-            }
-        }
-        else
-        {
-            ChipLogProgress(DeviceLayer, "KVS key: error when deleting [%s][%i]", key, pdmInternalId);
         }
     }
 exit:

diff --git a/third_party/openthread/ot-nxp b/third_party/openthread/ot-nxp
@@ -24,7 +24,7 @@ import("${nxp_sdk_build_root}/nxp_sdk.gni")
 openthread_nxp_root = "${chip_root}/third_party/openthread/ot-nxp"
 
 config("openthread_k32w1_config") {
-  include_dirs = [ "${openthread_nxp_root}/src/k32w1/k32w1" ]
+  include_dirs = [ "${openthread_nxp_root}/src/k32w1" ]
 
   defines = [
     "OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE=1",
@@ -59,8 +59,8 @@ config("openthread_k32w1_config") {
 
 source_set("openthread_core_config_k32w1") {
   sources = [
-    "${openthread_nxp_root}/src/k32w1/k32w1/openthread-core-k32w1-config-check.h",
-    "${openthread_nxp_root}/src/k32w1/k32w1/openthread-core-k32w1-config.h",
+    "${openthread_nxp_root}/src/k32w1/openthread-core-k32w1-config-check.h",
+    "${openthread_nxp_root}/src/k32w1/openthread-core-k32w1-config.h",
   ]
 
   public_configs = [ ":openthread_k32w1_config" ]
@@ -72,14 +72,14 @@ source_set("openthread_core_config_k32w1") {
 source_set("libopenthread-k32w1") {
   sources = [
     "${openthread_nxp_root}/src/common/crypto.c",
-    "${openthread_nxp_root}/src/k32w1/k32w1/alarm.c",
-    "${openthread_nxp_root}/src/k32w1/k32w1/diag.c",
-    "${openthread_nxp_root}/src/k32w1/k32w1/entropy.c",
-    "${openthread_nxp_root}/src/k32w1/k32w1/logging.c",
-    "${openthread_nxp_root}/src/k32w1/k32w1/misc.c",
-    "${openthread_nxp_root}/src/k32w1/k32w1/radio.c",
-    "${openthread_nxp_root}/src/k32w1/k32w1/system.c",
-    "${openthread_nxp_root}/src/k32w1/k32w1/uart.c",
+    "${openthread_nxp_root}/src/k32w1/alarm.c",
+    "${openthread_nxp_root}/src/k32w1/diag.c",
+    "${openthread_nxp_root}/src/k32w1/entropy.c",
+    "${openthread_nxp_root}/src/k32w1/logging.c",
+    "${openthread_nxp_root}/src/k32w1/misc.c",
+    "${openthread_nxp_root}/src/k32w1/radio.c",
+    "${openthread_nxp_root}/src/k32w1/system.c",
+    "${openthread_nxp_root}/src/k32w1/uart.c",
   ]
 
   if (chip_crypto == "platform") {

@@ -55,6 +55,8 @@ config("openthread_rt1060_config") {
       "OPENTHREAD_CONFIG_MULTICAST_DNS_ENABLE=1",
       "OPENTHREAD_CONFIG_MULTICAST_DNS_PUBLIC_API_ENABLE=1",
       "OT_APP_BR_LWIP_HOOKS_EN=1",
+      "OPENTHREAD_CONFIG_RADIO_LINK_TREL_ENABLE=1",
+      "OPENTHREAD_CONFIG_DNS_UPSTREAM_QUERY_ENABLE=1",
     ]
 
     if (nxp_enable_matter_cli) {
@@ -95,10 +97,12 @@ source_set("libopenthread-rt1060") {
     sources += [
       "${openthread_nxp_root}/src/common/br/border_agent.c",
       "${openthread_nxp_root}/src/common/br/br_rtos_manager.c",
+      "${openthread_nxp_root}/src/common/br/dns_upstream_resolver.c",
       "${openthread_nxp_root}/src/common/br/infra_if.c",
       "${openthread_nxp_root}/src/common/br/lwip_hooks.c",
       "${openthread_nxp_root}/src/common/br/lwip_mcast.c",
       "${openthread_nxp_root}/src/common/br/mdns_socket.c",
+      "${openthread_nxp_root}/src/common/br/trel_plat.c",
       "${openthread_nxp_root}/src/common/br/udp_plat.c",
       "${openthread_nxp_root}/src/common/br/utils.c",
     ]

@@ -54,6 +54,8 @@ config("openthread_rt1170_config") {
       "OPENTHREAD_CONFIG_MULTICAST_DNS_ENABLE=1",
       "OPENTHREAD_CONFIG_MULTICAST_DNS_PUBLIC_API_ENABLE=1",
       "OT_APP_BR_LWIP_HOOKS_EN=1",
+      "OPENTHREAD_CONFIG_RADIO_LINK_TREL_ENABLE=1",
+      "OPENTHREAD_CONFIG_DNS_UPSTREAM_QUERY_ENABLE=1",
     ]
 
     if (nxp_enable_matter_cli) {
@@ -93,10 +95,12 @@ source_set("libopenthread-rt1170") {
     sources += [
       "${openthread_nxp_root}/src/common/br/border_agent.c",
       "${openthread_nxp_root}/src/common/br/br_rtos_manager.c",
+      "${openthread_nxp_root}/src/common/br/dns_upstream_resolver.c",
       "${openthread_nxp_root}/src/common/br/infra_if.c",
       "${openthread_nxp_root}/src/common/br/lwip_hooks.c",
       "${openthread_nxp_root}/src/common/br/lwip_mcast.c",
       "${openthread_nxp_root}/src/common/br/mdns_socket.c",
+      "${openthread_nxp_root}/src/common/br/trel_plat.c",
       "${openthread_nxp_root}/src/common/br/udp_plat.c",
       "${openthread_nxp_root}/src/common/br/utils.c",
     ]

@@ -56,7 +56,9 @@ config("openthread_rw61x_config") {
       "OPENTHREAD_CONFIG_DNSSD_DISCOVERY_PROXY_ENABLE=1",
       "OPENTHREAD_CONFIG_MULTICAST_DNS_ENABLE=1",
       "OPENTHREAD_CONFIG_MULTICAST_DNS_PUBLIC_API_ENABLE=1",
+      "OPENTHREAD_CONFIG_RADIO_LINK_TREL_ENABLE=1",
       "OT_APP_BR_LWIP_HOOKS_EN=1",
+      "OPENTHREAD_CONFIG_DNS_UPSTREAM_QUERY_ENABLE=1",
     ]
 
     if (nxp_enable_matter_cli) {
@@ -91,10 +93,12 @@ source_set("libopenthread-rw61x") {
     sources += [
       "${openthread_nxp_root}/src/common/br/border_agent.c",
       "${openthread_nxp_root}/src/common/br/br_rtos_manager.c",
+      "${openthread_nxp_root}/src/common/br/dns_upstream_resolver.c",
       "${openthread_nxp_root}/src/common/br/infra_if.c",
       "${openthread_nxp_root}/src/common/br/lwip_hooks.c",
       "${openthread_nxp_root}/src/common/br/lwip_mcast.c",
       "${openthread_nxp_root}/src/common/br/mdns_socket.c",
+      "${openthread_nxp_root}/src/common/br/trel_plat.c",
       "${openthread_nxp_root}/src/common/br/udp_plat.c",
       "${openthread_nxp_root}/src/common/br/utils.c",
     ]
+50 −0		cmake/Kconfig
+30 −0		cmake/Kconfig.defconfig
+62 −0		cmake/Kconfig.sdk.common
+100 −53		cmake/build_helpers.cmake
+152 −0		cmake/rt/Kconfig.defconfig
+15 −0		cmake/rt/rt1170/Kconfig.defconfig
+6 −0		cmake/rt/rt1170/nxp_sdk_reconfig.cmake
+74 −0		cmake/rt/rw61x/Kconfig.defconfig
+57 −0		examples/platform/common/low_power/freertos_lp_hooks.c
+3 −0		examples/platform/k32w0/app/project_include/OpenThreadConfig.h
+5 −2		examples/platform/k32w0/scripts/sign-outdir.py
+3 −0		examples/platform/mcxw72/app/project_include/openthread/OpenThreadConfig.h
+2 −0		examples/platform/rt/rt1060/app/ldscripts/MIMXRT1062xxxxx_flexspi_nor.ld
+2 −1		examples/platform/rt/rt1060/app/project_include/openthread/OpenThreadConfig.h
+2 −0		examples/platform/rt/rt1170/app/ldscripts/MIMXRT1176xxxxx_cm7_flexspi_nor.ld
+2 −1		examples/platform/rt/rt1170/app/project_include/openthread/OpenThreadConfig.h
+2 −0		examples/platform/rt/rw61x/app/ldscripts/RW610_flash.ld
+2 −1		examples/platform/rt/rw61x/app/project_include/openthread/OpenThreadConfig.h
+23 −0		examples/platform/rt/rw61x/board/frdmrw612/app.h
+18 −1		examples/platform/rt/rw61x/board/frdmrw612/board.h
+128 −0		examples/platform/rt/rw61x/board/frdmrw612/board_comp.c
+80 −0		examples/platform/rt/rw61x/board/frdmrw612/board_comp.h
+15 −0		examples/platform/rt/rw61x/board/pin_mux.c
+13 −0		examples/platform/rt/rw61x/board/pin_mux.h
+24 −0		examples/platform/rt/rw61x/board/rdrw612bga/app.h
+10 −1		examples/platform/rt/rw61x/board/rdrw612bga/board.h
+59 −0		examples/platform/rt/rw61x/board/rdrw612bga/board_comp.c
+48 −0		examples/platform/rt/rw61x/board/rdrw612bga/board_comp.h
+218 −0		examples/platform/rt/rw61x/nxp_sdk_reconfig.cmake
+10 −7		github_sdk/common_sdk/manifest/west.yml
+13 −6		gn_build/mcxw71_k32w1_sdk/core_sdk.gni
+6 −1		gn_build/mcxw71_k32w1_sdk/mcxw71_k32w1_sdk.gni
+2 −1		gn_build/rt_sdk/BUILD.gn
+3 −2		gn_build/rt_sdk/lwip/wifi_openthread/lwipopts.h
+4 −0		gn_build/rt_sdk/rt_sdk.gni
+8 −0		gn_build/rt_sdk/rw61x/rw61x.gni
+4 −0		gn_build/rt_sdk/transceiver/wifi_config.h
+39 −3		scripts/update_nxp_sdk.py
+3 −26		CMakeLists.txt
+2 −2		README.md
+34 −24		examples/br/CMakeLists.txt
+7 −13		examples/br/README-OTBR.md
+60 −103		examples/br/br_ot_freertos.c
+0 −637		examples/br/ncp_otbr_freertos.c
+4 −0		examples/hybrid/CMakeLists.txt
+0 −0		examples/hybrid/ot_cli_ftd_ble_loc_reader/CMakeLists.txt
+131 −0		examples/hybrid/ot_cli_ftd_ble_loc_reader/mcxw72/CMakeLists.txt
+189 −0		examples/hybrid/ot_cli_ftd_ble_loc_reader/src/app_preinclude.h
+22 −0		examples/hybrid/ot_cli_ftd_ble_loc_reader/src/ble_preinclude.h
+183 −0		examples/hybrid/ot_cli_ftd_ble_loc_reader/src/main.c
+1 −1		examples/hybrid/ot_cli_ftd_ble_shell/k32w1/CMakeLists.txt
+3 −4		examples/hybrid/ot_cli_ftd_ble_shell/mcxw72/CMakeLists.txt
+1 −1		examples/hybrid/ot_cli_ftd_zc/k32w1/CMakeLists.txt
+1 −1		examples/hybrid/ot_rcp_uart_dma_zb_coprocessor/k32w1/CMakeLists.txt
+6 −73		examples/utils/cli_addons/ephemeral_key/ephemeral_key_cli.c
+2 −1		examples/utils/cli_addons/iperf/iperf_cli.c
+7 −1		examples/utils/cli_addons/wifi/wifi_cli.c
+0 −1		examples/utils/cli_addons/wifi/wifi_cli.h
+1 −1		openthread
+0 −1		script/build_k32w1
+1 −1		script/build_mcxw71
+32 −1		script/build_mcxw72
+0 −105		script/build_rw610n
+175 −95		src/common/br/border_agent.c
+2 −5		src/common/br/border_agent.h
+199 −23		src/common/br/br_rtos_manager.c
+6 −0		src/common/br/br_rtos_manager.h
+262 −0		src/common/br/dns_upstream_resolver.c
+14 −6		src/common/br/dns_upstream_resolver.h
+15 −0		src/common/br/infra_if.c
+27 −11		src/common/br/lwip_hooks.c
+581 −0		src/common/br/trel_plat.c
+18 −18		src/common/br/trel_plat.h
+101 −44		src/common/br/udp_plat.c
+15 −1		src/common/br/utils.c
+3 −1		src/common/br/utils.h
+32 −10		src/common/flash_nvs.c
+5 −19		src/common/lwip/lwipopts.h
+10 −4		src/common/lwip/ot_lwip.c
+10 −4		src/common/lwip/ot_lwip.h
+2 −0		src/imx_rt/rt1060/CMakeLists.txt
+47 −0		src/imx_rt/rt1060/openthread-core-rt1060-config.h
+2 −0		src/imx_rt/rt1170/CMakeLists.txt
+47 −0		src/imx_rt/rt1170/openthread-core-rt1170-config.h
+37 −0		src/k32w0/jn5189/openthread-core-jn5189-config.h
+37 −0		src/k32w0/k32w061/openthread-core-k32w061-config.h
+103 −2		src/k32w1/CMakeLists.txt
+0 −0		src/k32w1/K32W1480_connectivity.ld
+0 −0		src/k32w1/README.md
+0 −0		src/k32w1/alarm.c
+0 −0		src/k32w1/diag.c
+84 −84		src/k32w1/entropy.c
+4 −4		src/k32w1/k32w1.cmake
+0 −130		src/k32w1/k32w1/CMakeLists.txt
+0 −0		src/k32w1/logging.c
+0 −0		src/k32w1/misc.c
+0 −0		src/k32w1/openthread-core-k32w1-config-check.h
+48 −0		src/k32w1/openthread-core-k32w1-config.h
+0 −0		src/k32w1/platform-k32w1.h
+4 −1		src/k32w1/radio.c
+0 −0		src/k32w1/startup_K32W1480.S
+0 −0		src/k32w1/system.c
+0 −0		src/k32w1/uart.c
+8 −8		src/mcxw/mcxw71/CMakeLists.txt
+0 −0		src/mcxw/mcxw71/README.md
+3 −3		src/mcxw/mcxw71/mcxw71.cmake
+0 −0		src/mcxw/mcxw71/openthread-core-mcxw71-config-check.h
+48 −0		src/mcxw/mcxw71/openthread-core-mcxw71-config.h
+8 −8		src/mcxw/mcxw72/CMakeLists.txt
+1 −1		src/mcxw/mcxw72/mcxw72.cmake
+48 −0		src/mcxw/mcxw72/openthread-core-mcxw72-config.h
+0 −28		src/rw/rw610n/CMakeLists.txt
+0 −57		src/rw/rw610n/arm-none-eabi.cmake
+0 −212		src/rw/rw610n/openthread-core-rw610n-config.h
+0 −109		src/rw/rw610n/platform/alarm.c
+0 −95		src/rw/rw610n/platform/diag.c
+0 −60		src/rw/rw610n/platform/entropy.c
+0 −72		src/rw/rw610n/platform/misc.c
+0 −83		src/rw/rw610n/platform/platform-rw610n.h
+0 −792		src/rw/rw610n/platform/radio.c
+0 −83		src/rw/rw610n/platform/system.c
+0 −113		src/rw/rw610n/platform/uart.c
+0 −201		src/rw/rw610n/rw610n.ld
+0 −374		src/rw/rw610n/rw610n_vendor_hook.cpp
+2 −0		src/rw/rw612/CMakeLists.txt
+47 −10		src/rw/rw612/openthread-core-rw612-config.h
+3 −6		third_party/github_sdk/manifest/west.yml
+5 −2		third_party/k32w1_sdk/CMakeLists.txt
+17 −21		third_party/lwip/CMakeLists.txt
+16 −13		third_party/mcxw71_sdk/CMakeLists.txt
+60 −27		third_party/mcxw72_sdk/CMakeLists.txt
+38 −23		third_party/mcxw72_sdk/ble/CMakeLists.txt
+10 −0		third_party/rw612_sdk/CMakeLists.txt
+1 −0		third_party/wifi/CMakeLists.txt