[NXP] Upstream nxp zephyr 4.1.0 support (#38990)

* [nxp][zephyr] Migrate to Zephyr 4.1

Config and code update to migrate to 4.1 Zephyr
+ Memory footprint optimization
+ Revert Zephyr 4.0 workarounds

Adding build release configuration for zephyr examples.

Removing KCONFIG no more applicable in Zephyr 4.1

Signed-off-by: Gatien Chapon <[email protected]>

* [nxp][zephyr][doc] Update Zephyr nxp downstream tag to 4.1.0 version

Signed-off-by: Martin Girardot <[email protected]>

* Restyled by clang-format

* add zephyr version check for 4.1.0 wifi feature

Signed-off-by: Martin Girardot <[email protected]>

* update nxp zephyr docker image version

Signed-off-by: Martin Girardot <[email protected]>

---------

Signed-off-by: Gatien Chapon <[email protected]>
Signed-off-by: Martin Girardot <[email protected]>
Co-authored-by: Yassine El Aissaoui <[email protected]>
Co-authored-by: Restyled.io <[email protected]>

Author: 3 people

.github/workflows/examples-nxp.yaml

@@ -219,7 +219,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nxp-zephyr:129
+            image: ghcr.io/project-chip/chip-build-nxp-zephyr:132
 
         steps:
             - name: Checkout

config/nxp/chip-module/Kconfig.defaults

@@ -1,5 +1,5 @@
 #
-#   Copyright (c) 2024 Project CHIP Authors
+#   Copyright (c) 2024-2025 Project CHIP Authors
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -136,7 +136,7 @@ config NET_TC_TX_THREAD_BASE_PRIO
 config NET_TC_RX_THREAD_BASE_PRIO
 	default 3
 
-config NET_TC_SKIP_FOR_HIGH_PRIO
+config NET_TC_TX_SKIP_FOR_HIGH_PRIO
 	default y
 
 config NET_CONTEXT_PRIORITY
@@ -214,7 +214,7 @@ config BT_RX_STACK_SIZE
 	default 1700
 
 config BT_LONG_WQ_STACK_SIZE
-	default 1024
+	default 2560
 
 config BT_DEVICE_NAME_GATT_WRITABLE
 	bool
@@ -245,6 +245,31 @@ choice NXP_WIFI_PART
 	default NXP_RW610 if SOC_SERIES_RW6XX
 endchoice
 
+# Disable unnecessary features to save code size
+# Saves 365kB of flash
+config NXP_WIFI_SOFTAP_SUPPORT
+	default n
+
+# Saves 61kB of flash
+config NXP_WIFI_CSI
+	default n
+
+# Saves 45kB of flash
+config WIFI_NM_WPA_SUPPLICANT_ADVANCED_FEATURES
+	default n
+
+config NXP_WIFI_MON_TASK_STACK_SIZE
+	default 1024
+
+config NXP_WIFI_WLCMGR_TASK_STACK_SIZE
+	default 2048
+
+config NXP_WIFI_TX_TASK_STACK_SIZE
+	default 1024
+
+config NXP_WIFI_SCAN_TASK_STACK_SIZE
+	default 1024
+
 config ZVFS_OPEN_MAX
 	default 30
 
@@ -321,7 +346,7 @@ config NET_MAX_CONN
 	default 10
 
 config SHELL_STACK_SIZE
-	default 2616
+	default 1536
 
 config HEAP_MEM_POOL_SIZE
 	default 122880
@@ -344,10 +369,6 @@ endif
 
 if CHIP_ETHERNET
 
-choice NXP_ENET_DRIVER
-	default ETH_NXP_ENET
-endchoice
-
 config NET_SOCKETS_POLL_MAX
 	default 7
 
@@ -360,6 +381,9 @@ config MBEDTLS
 config MBEDTLS_CFG_FILE
 	default "config-tls-generic.h"
 
+config MBEDTLS_PSA_KEY_SLOT_COUNT
+    default 64
+
 config MBEDTLS_USER_CONFIG_ENABLE
     default y
 
@@ -431,16 +455,22 @@ endif # MCUX_ELS_PKC
 
 if SHELL
 
-config KERNEL_SHELL
+config SHELL_MINIMAL
 	default y
 
-config DEVICE_SHELL
+config SHELL_HELP
+	default y
+
+config KERNEL_SHELL
 	default y
 
 config REBOOT
 	default y
 
 # Disable not used shell modules
+config DEVICE_SHELL
+	default n
+
 config SHELL_WILDCARD
 	default n
 

config/nxp/chip-module/Kconfig.features

@@ -1,5 +1,5 @@
 #
-#   Copyright (c) 2024 Project CHIP Authors
+#   Copyright (c) 2024-2025 Project CHIP Authors
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -25,10 +25,6 @@ config CHIP_WIFI
 	select WIFI
 	select WIFI_NXP
 	select WIFI_NM_WPA_SUPPLICANT
-	select WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-	select WIFI_NM_WPA_SUPPLICANT_DPP
-	select WIFI_NM_WPA_SUPPLICANT_EAPOL
-	select WIFI_NM_WPA_SUPPLICANT_WPS
 	select NET_L2_ETHERNET
 	select NET_IPV4
 	select NET_DHCPV4

docs/platforms/nxp/nxp_zephyr_guide.md

@@ -52,20 +52,20 @@ Prerequisites:
 -   Follow instruction from [BUILDING.md](../../guides/BUILDING.md) to setup the
     Matter environment
 -   Follow instruction from
-    [Getting Started Guide](https://docs.zephyrproject.org/4.0.0/develop/getting_started/index.html)
+    [Getting Started Guide](https://docs.zephyrproject.org/4.1.0/develop/getting_started/index.html)
     to setup a Zephyr workspace, however, the west init command to use is as
     follows:
 
 ```shell
-$ west init zephyrproject -m https://github.com/nxp-zephyr/nxp-zsdk.git --mr nxp-v4.0.0
+$ west init zephyrproject -m https://github.com/nxp-zephyr/nxp-zsdk.git --mr nxp-v4.1.0
 ```
 
 > **Note**: While some of NXP platforms are supported in Zephyr upstream, we
 > recommend using nxp-zsdk downstream to get access to all NXP features that are
 > not upstream yet. While you can decide to use nxp-zsdk top of tree, we
 > recommend using a proper release tag delivered by NXP. This will ensure a
 > certain level of quality of the nxp-zsdk in use. Currently, we highly
-> recommend using the `nxp-v4.0.0` tag, based on Zephyr 4.0 release. Reach to
+> recommend using the `nxp-v4.1.0` tag, based on Zephyr 4.1 release. Reach to
 > your NXP contact for more details.
 
 Steps to build the example:
@@ -212,6 +212,17 @@ See
 
 <a name="ota-software-update"></a>
 
+### Build in release mode
+
+To build the example in release mode, you can add
+`-DEXTRA_CONF_FILE=prj_release.conf` in the west build command line.
+
+Example:
+
+```bash
+west build -b <board> -p  <path to example folder> -- -DEXTRA_CONF_FILE=prj_release.conf
+```
+
 ## OTA Software Update
 
 See

examples/all-clusters-app/nxp/zephyr/boards/frdm_rw612_fdata.conf

@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2024 Project CHIP Authors
+#    Copyright (c) 2024-2025 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -21,6 +21,3 @@ CONFIG_CHIP_DEVICE_PRODUCT_ID=41510
 CONFIG_CHIP_DEVICE_PRODUCT_URL="https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/frdm-development-board-for-rw612-wi-fi-6-plus-bluetooth-low-energy-plus-802-15-4-tri-radio-wireless-mcu:FRDM-RW612"
 CONFIG_CHIP_DEVICE_PRODUCT_LABEL="RW612"
 CONFIG_CHIP_DEVICE_PART_NUMBER="RW612"
-
-# Workaround for nxp-zsdk v4.0.0 release
-CONFIG_FLASH_LOAD_SIZE=0

examples/all-clusters-app/nxp/zephyr/boards/frdm_rw612.conf renamed to examples/all-clusters-app/nxp/zephyr/prj_release.conf

@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2024 Project CHIP Authors
+#    Copyright (c) 2025 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,5 +14,27 @@
 #    limitations under the License.
 #
 
-# Workaround for nxp-zsdk v4.0.0 release
-CONFIG_FLASH_LOAD_SIZE=0
+CONFIG_BOOT_BANNER=n
+
+CONFIG_THREAD_NAME=n
+CONFIG_MPU_STACK_GUARD=n
+
+CONFIG_ASSERT=n
+
+CONFIG_DEBUG=n
+CONFIG_DEBUG_INFO=n
+CONFIG_DEBUG_THREAD_INFO=n
+
+CONFIG_CHIP_STATISTICS=n
+CONFIG_SIZE_OPTIMIZATIONS_AGGRESSIVE=y
+# Additional debug features, user may want to disable some of them
+
+# Shell
+# CONFIG_CHIP_LIB_SHELL=n
+# CONFIG_SHELL=n
+
+# Console & Logs
+# CONFIG_SERIAL=n
+# CONFIG_LOG=n
+# CONFIG_CONSOLE=n
+# CONFIG_UART_CONSOLE=n

examples/laundry-washer-app/nxp/zephyr/boards/frdm_rw612_fdata.conf

@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2024 Project CHIP Authors
+#    Copyright (c) 2024-2025 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -21,6 +21,3 @@ CONFIG_CHIP_DEVICE_PRODUCT_ID=41510
 CONFIG_CHIP_DEVICE_PRODUCT_URL="https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/frdm-development-board-for-rw612-wi-fi-6-plus-bluetooth-low-energy-plus-802-15-4-tri-radio-wireless-mcu:FRDM-RW612"
 CONFIG_CHIP_DEVICE_PRODUCT_LABEL="RW612"
 CONFIG_CHIP_DEVICE_PART_NUMBER="RW612"
-
-# Workaround for nxp-zsdk v4.0.0 release
-CONFIG_FLASH_LOAD_SIZE=0

examples/laundry-washer-app/nxp/zephyr/boards/frdm_rw612.conf renamed to examples/laundry-washer-app/nxp/zephyr/prj_release.conf

@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2024 Project CHIP Authors
+#    Copyright (c) 2025 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,5 +14,27 @@
 #    limitations under the License.
 #
 
-# Workaround for nxp-zsdk v4.0.0 release
-CONFIG_FLASH_LOAD_SIZE=0
+CONFIG_BOOT_BANNER=n
+
+CONFIG_THREAD_NAME=n
+CONFIG_MPU_STACK_GUARD=n
+
+CONFIG_ASSERT=n
+
+CONFIG_DEBUG=n
+CONFIG_DEBUG_INFO=n
+CONFIG_DEBUG_THREAD_INFO=n
+
+CONFIG_CHIP_STATISTICS=n
+CONFIG_SIZE_OPTIMIZATIONS_AGGRESSIVE=y
+# Additional debug features, user may want to disable some of them
+
+# Shell
+# CONFIG_CHIP_LIB_SHELL=n
+# CONFIG_SHELL=n
+
+# Console & Logs
+# CONFIG_SERIAL=n
+# CONFIG_LOG=n
+# CONFIG_CONSOLE=n
+# CONFIG_UART_CONSOLE=n

examples/thermostat/nxp/zephyr/boards/frdm_rw612_fdata.conf

@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2024 Project CHIP Authors
+#    Copyright (c) 2024-2025 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -21,6 +21,3 @@ CONFIG_CHIP_DEVICE_PRODUCT_ID=41510
 CONFIG_CHIP_DEVICE_PRODUCT_URL="https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/frdm-development-board-for-rw612-wi-fi-6-plus-bluetooth-low-energy-plus-802-15-4-tri-radio-wireless-mcu:FRDM-RW612"
 CONFIG_CHIP_DEVICE_PRODUCT_LABEL="RW612"
 CONFIG_CHIP_DEVICE_PART_NUMBER="RW612"
-
-# Workaround for nxp-zsdk v4.0.0 release
-CONFIG_FLASH_LOAD_SIZE=0

examples/thermostat/nxp/zephyr/boards/frdm_rw612.conf renamed to examples/thermostat/nxp/zephyr/prj_release.conf

@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2024 Project CHIP Authors
+#    Copyright (c) 2025 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,5 +14,27 @@
 #    limitations under the License.
 #
 
-# Workaround for nxp-zsdk v4.0.0 release
-CONFIG_FLASH_LOAD_SIZE=0
+CONFIG_BOOT_BANNER=n
+
+CONFIG_THREAD_NAME=n
+CONFIG_MPU_STACK_GUARD=n
+
+CONFIG_ASSERT=n
+
+CONFIG_DEBUG=n
+CONFIG_DEBUG_INFO=n
+CONFIG_DEBUG_THREAD_INFO=n
+
+CONFIG_CHIP_STATISTICS=n
+CONFIG_SIZE_OPTIMIZATIONS_AGGRESSIVE=y
+# Additional debug features, user may want to disable some of them
+
+# Shell
+# CONFIG_CHIP_LIB_SHELL=n
+# CONFIG_SHELL=n
+
+# Console & Logs
+# CONFIG_SERIAL=n
+# CONFIG_LOG=n
+# CONFIG_CONSOLE=n
+# CONFIG_UART_CONSOLE=n