Revert "[nxp noup][zephyr] Migrate to Zephyr 3.7 LTS"

This reverts commit efa621a.

Signed-off-by: marius-alex-tache <marius.tache@nxp.com>

Author: marius-alex-tache

config/nxp/app/enable-gnu-std.cmake

@@ -1,22 +1,22 @@
 #
-# Copyright (c) 2024 Project CHIP Authors
+#   Copyright (c) 2024 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.
-# You may obtain a copy of the License at
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+#       http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
 #
 
 add_library(gnu17 INTERFACE)
 target_compile_options(gnu17
-	INTERFACE
-	$<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
-	-Wno-stringop-truncation)
+    INTERFACE
+        $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
+        -D_SYS__PTHREADTYPES_H_)
 target_link_libraries(app PRIVATE gnu17)

config/nxp/app/pre-zephyr.cmake

@@ -13,3 +13,9 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
+# Automatically find overlays defined at platform level
+# Those are usually used to change FLASH and RAM layouts
+if (EXISTS ${CHIP_ROOT}/src/platform/nxp/zephyr/boards/${BOARD}/${BOARD}.overlay)
+	list(APPEND EXTRA_DTC_OVERLAY_FILE ${CHIP_ROOT}/src/platform/nxp/zephyr/boards/${BOARD}/${BOARD}.overlay)
+endif()

config/nxp/chip-module/CMakeLists.txt

@@ -174,7 +174,14 @@ endif()
 # ==============================================================================
 # Define 'chip-ota-image' target for building CHIP OTA image
 # ==============================================================================
-if(CONFIG_CHIP_OTA_REQUESTOR)
+if(EXISTS "${CHIP_ROOT}/src/platform/nxp/zephyr/boards/${BOARD}/${BOARD}.overlay")
+  set(DTC_BOARD_OVERLAY "${CHIP_ROOT}/src/platform/nxp/zephyr/boards/${BOARD}/${BOARD}.overlay")
+else()
+  set(DTC_BOARD_OVERLAY "")
+  message(STATUS "No board overlay found")
+endif()
+
+if (CONFIG_CHIP_OTA_REQUESTOR)
     if(CONFIG_MCUBOOT_SIGNATURE_KEY_FILE STREQUAL "")
         set(ZEPHYR_OUTPUT_NAME "zephyr")
     else()
@@ -186,8 +193,7 @@ if(CONFIG_CHIP_OTA_REQUESTOR)
     add_custom_target(build_mcuboot ALL
         COMMAND
         west build -b ${BOARD} -d build_mcuboot ${ZEPHYR_BASE}/../bootloader/mcuboot/boot/zephyr
-            -- -DOVERLAY_CONFIG=${GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE}
-            -DEXTRA_DTC_OVERLAY_FILE="${DTC_OVERLAY_FILE};${EXTRA_DTC_OVERLAY_FILE}"
+            -- -DOVERLAY_CONFIG=${GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE} -DEXTRA_DTC_OVERLAY_FILE=${DTC_BOARD_OVERLAY}
         COMMAND
         cp ${PROJECT_BINARY_DIR}/../modules/connectedhomeip/build_mcuboot/zephyr/zephyr.bin ${PROJECT_BINARY_DIR}/zephyr.mcuboot.bin
     )

config/nxp/chip-module/Kconfig.defaults

@@ -91,13 +91,13 @@ config POSIX_MAX_FDS
 
 # Application stack size
 config MAIN_STACK_SIZE
-	default 3072
+	default 8192
 
 config INIT_STACKS
 	default y
 
 config NET_MGMT_EVENT_STACK_SIZE
-	default 1024
+	default 2048
 
 config NET_MGMT_EVENT_QUEUE_SIZE
 	default 20
@@ -136,27 +136,21 @@ config NET_TC_TX_THREAD_BASE_PRIO
 config NET_TC_RX_THREAD_BASE_PRIO
 	default 3
 
-config NET_TC_SKIP_FOR_HIGH_PRIO
-	default y
-
-config NET_CONTEXT_PRIORITY
-	default y
-
 # Network buffers
 config NET_PKT_RX_COUNT
-	default 14
+	default 60
 
 config NET_PKT_TX_COUNT
-	default 14
+	default 40
 
 config NET_BUF_RX_COUNT
-	default 36
+	default 60
 
 config NET_BUF_TX_COUNT
-	default 36
+	default 80
 
 config NET_BUF_DATA_SIZE
-	default 256
+	default 1744
 
 # Bluetooth Low Energy configs
 
@@ -211,10 +205,7 @@ config BT_BUF_ACL_TX_SIZE
 
 config BT_RX_STACK_SIZE
 	default 2048 if NO_OPTIMIZATIONS && DEBUG
-	default 1700
-
-config BT_LONG_WQ_STACK_SIZE
-	default 1024
+	default 1600
 
 config BT_DEVICE_NAME_GATT_WRITABLE
 	bool
@@ -241,33 +232,16 @@ config NVS_LOOKUP_CACHE_SIZE
 
 if CHIP_WIFI
 
-choice NXP_WIFI_PART
-	default NXP_RW610 if SOC_SERIES_RW6XX
-endchoice
-
-config ZVFS_OPEN_MAX
-	default 30
-
 choice SCHED_ALGORITHM
 	default SCHED_MULTIQ
 endchoice
 
-choice WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_CHOICE
-	default WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF
+choice WPA_SUPP_LOG_LEVEL_CHOICE
+	default WPA_SUPP_LOG_LEVEL_ERR
 endchoice
 
-choice WIFI_NM_WPA_SUPPLICANT_CRYPTO_BACKEND
-	default WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT
-endchoice
-
-config WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE
-	default 6144
-
-config WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE
-	default 5120
-
-config WIFI_NM_WPA_SUPPLICANT_INF_MON
-	default n
+config WPA_SUPP_THREAD_STACK_SIZE
+	default 12288
 
 config SYSTEM_WORKQUEUE_STACK_SIZE
 	default 2048
@@ -283,7 +257,7 @@ config NET_IF_MCAST_IPV6_ADDR_COUNT
 	default 8
 
 config NET_SOCKETS_POLL_MAX
-	default 14
+	default 8
 
 config NET_IPV4_FRAGMENT_MAX_COUNT
 	default 3
@@ -298,7 +272,7 @@ config NET_IPV6_FRAGMENT_MAX_COUNT
 	default 3
 
 config NET_IPV6_FRAGMENT_MAX_PKT
-	default 8
+	default 7
 
 config NET_IPV6_FRAGMENT_TIMEOUT
 	default 3
@@ -309,7 +283,7 @@ config NET_MAX_ROUTERS
 	default 1
 
 config NET_MAX_CONN
-	default 10
+	default 4
 
 config SHELL_STACK_SIZE
 	default 2616
@@ -349,9 +323,6 @@ config MBEDTLS_ENTROPY_ENABLED
 config MBEDTLS_ZEPHYR_ENTROPY
 	default y
 
-config MBEDTLS_SSL_MAX_CONTENT_LEN
-	default 8192
-
 config MBEDTLS_ENABLE_HEAP
 	default y
 
@@ -376,16 +347,13 @@ config MBEDTLS_ECP_C
 config MBEDTLS_ECP_DP_SECP256R1_ENABLED
 	default y
 
-config CHIP_CRYPTO_PSA
-	default y
-
 if CHIP_CRYPTO_PSA
 
 config MBEDTLS_PSA_CRYPTO_C
 	default y
 
-config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
-	default y if WIFI_NM_WPA_SUPPLICANT
+config WPA_SUPP_CRYPTO_MBEDTLS_PSA
+	default y if WPA_SUPP_CRYPTO
 
 endif
 
@@ -394,11 +362,11 @@ config MCUX_ELS_PKC
 
 if MCUX_ELS_PKC
 
-config MCUX_PSA_CRYPTO_DRIVER_ELS_PKC
-	default y if CHIP_CRYPTO_PSA
+config KSDK_MBEDTLS
+	default n
 
-config MCUX_PSA_CRYPTO_DRIVER_ELS_PKC_THREAD
-	default y if CHIP_CRYPTO_PSA
+config MCUX_PSA_CRYPTO_DRIVER_ELS_PKC
+	default y if MBEDTLS_PSA_CRYPTO_C
 
 config ENTROPY_GENERATOR
 	default y

config/nxp/chip-module/Kconfig.features

@@ -24,16 +24,11 @@ config CHIP_WIFI
 	default y
 	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
-	select DNS_RESOLVER
-	imply THREAD_CUSTOM_DATA
+	select WPA_SUPP
+	select WPA_SUPP_AP
+	select WPA_SUPP_WPS
+	select WPA_SUPP_WPA3
+	select WPA_SUPP_CRYPTO_ENTERPRISE
 	imply MBEDTLS_ENTROPY_C
 	imply NET_STATISTICS
 	imply NET_PKT_TXTIME

config/zephyr/Kconfig

@@ -22,15 +22,15 @@ menuconfig CHIP
 	imply REQUIRES_FULL_LIBC
 	imply NEWLIB_LIBC_NANO
 	imply CBPRINTF_LIBC_SUBSTS
-	imply POSIX_API if !ARCH_POSIX && !CHIP_NRF_PLATFORM
+	imply POSIX_API if !ARCH_POSIX && !CHIP_NRF_PLATFORM && !CHIP_NXP_PLATFORM
 	imply EVENTFD if !ARCH_POSIX
 	imply REBOOT
 	imply ENTROPY_GENERATOR
 	imply NET_UDP
 	imply NET_IPV6
 	imply NET_CONFIG_NEED_IPV6
 	imply NET_SOCKETS
-	imply NET_SOCKETS_POSIX_NAMES if !ARCH_POSIX && CHIP_NRF_PLATFORM
+	imply NET_SOCKETS_POSIX_NAMES if !ARCH_POSIX && (CHIP_NRF_PLATFORM || CHIP_NXP_PLATFORM)
 	imply NETWORKING
 	imply HWINFO
 	imply FLASH

docs/guides/nxp/nxp_zephyr_ota_software_update.md

@@ -33,15 +33,16 @@ The Flash is divided into different regions as follow :
     (candidate application).
 
 The size reserved for each partition can be found in
-`<example folder>/boards/<board>.overlay`.
+`src/platform/nxp/zephyr/boards/board.overlay`.
 
 Notes :
 
 -   When applicable, BLE/15.4/Wi-Fi firmware are embedded in the application
     binary, ensuring compatibility between the application and the controllers.
 -   The sizes of the primary and secondary applications are provided as an
     example. The size can be changed by overriding the partitions located at
-    `<board>.overlay`.
+    `board.overlay`.(example:
+    `src/platform/nxp/zephyr/boards/rd_rw612_bga.overlay`)
 
 ### MCUBoot Bootloader
 

examples/all-clusters-app/nxp/zephyr/README.md

@@ -31,9 +31,7 @@ NXP/Zephyr SDK.
 
 The example supports:
 
-- Matter over Wi-Fi with BLE commissioning
-- Matter OTA requestor
-- Matter Factory Data
+-   Matter over Wi-Fi
 
 The supported boards are:
 
@@ -51,22 +49,18 @@ Prerequisites:
 -   Follow instruction from [BUILDING.md](../../../../docs/guides/BUILDING.md)
     to setup the Matter environment
 -   Follow instruction from
-    [Getting Started Guide](https://docs.zephyrproject.org/3.7.0/develop/getting_started/index.html)
+    [Getting Started Guide](https://docs.zephyrproject.org/latest/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 zsdk_lts3
+$ west init zephyrproject -m https://github.com/nxp-zephyr-ear/zephyr.git --mr zephyr_rw61x_v3.6_RFP
 ```
 
-> **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 `zsdk_lts3` tag, based on Zephyr 3.7 LTS release.
-> Reach to your NXP contact for more details.
+> **Note**: Currently, supported NXP platforms in Zephyr targeting Matter are
+> not available in the official Zephyr repo, you'll have to use the NXP fork
+> `https://github.com/nxp-zephyr-ear/zephyr` github repo. Reach to your NXP
+> contact for more details.
 
 Steps to build the example, targeting `rd_rw612_bga` board:
 
@@ -85,16 +79,15 @@ source <path to zephyr repo>/zephyr-env.sh
 3. Run west build command:
 
 ```shell
-west build -b rd_rw612_bga -p auto -d build_zephyr <path to example folder>
+west build -b rd_rw612_bga -p  <path to example folder>
 ```
 
-A folder `build_zephyr` will be created in the same folder you run the command from.
-The binaries will be created in `build_zephyr/zephyr` with the name `zephyr.elf` and
-`zephyr.bin`. We recommend using the `-d build_zephyr` if you are building from Matter
-repo root folder as a build folder already exists and is tracked by git.
+By default, a folder `build` will be created in the same folder you run the
+command from. The binaries will be created in `build/zephyr` with the name
+`zephyr.elf` and `zephyr.bin`.
 
 You can get more details on `west build` with
-[Zephyr's building guide](https://docs.zephyrproject.org/3.7.0/develop/west/build-flash-debug.html#building-west-build)
+[Zephyr's building guide](https://docs.zephyrproject.org/latest/develop/west/build-flash-debug.html#building-west-build)
 
 <a name="flashing-and-debugging"></a>
 
@@ -109,7 +102,7 @@ west flash -i <J-Link serial number>
 ```
 
 You can get more details on `west flash` with
-[Zephyr's flashing guide](https://docs.zephyrproject.org/3.7.0/develop/west/build-flash-debug.html#flashing-west-flash)
+[Zephyr's flashing guide](https://docs.zephyrproject.org/latest/develop/west/build-flash-debug.html#flashing-west-flash)
 
 > **Note**: `west flash` will not start a debug session, it will only flash and
 > reset the device
@@ -120,7 +113,7 @@ To debug a Matter with Zephyr application, you could use several methods:
 
 -   [MCUXpresso IDE (version >= 11.6.0)](https://www.nxp.com/design/software/development-software/mcuxpresso-software-and-tools-/mcuxpresso-integrated-development-environment-ide:MCUXpresso-IDE)
 -   `west debug`
-    [Zephyr's debugging guide](https://docs.zephyrproject.org/3.7.0/develop/west/build-flash-debug.html#id29)
+    [Zephyr's debugging guide](https://docs.zephyrproject.org/latest/develop/west/build-flash-debug.html#id29)
 
 > **Note**: As the build provides an elf file, any compatible debugging tool can
 > be used.