Merge branch 'master' into master

.github/workflows/examples-linux-tv-casting-app.yaml

@@ -17,7 +17,7 @@ name: Test TV Casting Example
 on:
     push:
         branches-ignore:
-            - 'dependabot/**'
+            - "dependabot/**"
     pull_request:
     merge_group:
 
@@ -63,6 +63,12 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                     "scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app"
 
+            - name: Test casting from Linux tv-casting-app to Linux tv-app
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                    "python3 ./scripts/tests/run_tv_casting_test.py"
+              timeout-minutes: 1
+
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
               if: ${{ !env.ACT }}

.gitignore

@@ -10,6 +10,7 @@
 
 # Build System
 out/
+/examples/virtual-device-app/android/App/buildSrc/build/
 /src/test_driver/nrfconnect/build/
 /src/darwin/Framework/build/
 

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

@@ -1,6 +1,5 @@
 add_library(gnu17 INTERFACE)
 target_compile_options(gnu17
     INTERFACE 
-        $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
-        -D_SYS__PTHREADTYPES_H_)
+        $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
 target_link_libraries(app PRIVATE gnu17)

config/nrfconnect/chip-module/CMakeLists.txt

@@ -168,7 +168,8 @@ else()
 endif()
 
 if (CONFIG_CHIP_CRYPTO_PSA)
-    matter_add_gn_arg_string("chip_crypto" "psa")
+    matter_add_gn_arg_string("chip_crypto"             "psa")
+    matter_add_gn_arg_bool  ("chip_crypto_psa_spake2p" CONFIG_PSA_WANT_ALG_SPAKE2P_MATTER)
 endif()
 
 if (BOARD STREQUAL "native_posix")

config/nrfconnect/chip-module/Kconfig

@@ -302,4 +302,9 @@ config CHIP_FACTORY_RESET_ON_KEY_MIGRATION_FAILURE
 	  Perform factory reset of the device if the operational key for Fabric has not been migrated
 	  properly to PSA ITS storage.
 
+config CHIP_PERSISTENT_SUBSCRIPTIONS
+	default n
+	# selecting experimental for this feature since there is an issue with multiple controllers.
+	select EXPERIMENTAL
+
 endif # CHIP

config/nrfconnect/chip-module/Kconfig.defaults

@@ -24,6 +24,10 @@ if CHIP
 # System configuration
 # ==============================================================================
 
+choice LIBC_IMPLEMENTATION
+    default NEWLIB_LIBC
+endchoice
+
 config ASSERT
     default y
 
@@ -298,6 +302,7 @@ config MBEDTLS_HEAP_SIZE
 
 config CHIP_CRYPTO_PSA
     default y if !CHIP_WIFI
+    imply PSA_WANT_ALG_SPAKE2P_MATTER
 
 if CHIP_CRYPTO_PSA
 
@@ -317,13 +322,13 @@ if PSA_CRYPTO_DRIVER_CC3XX && PSA_CRYPTO_DRIVER_OBERON
 config PSA_USE_CC3XX_HASH_DRIVER
     default n
 
-endif
+endif # PSA_CRYPTO_DRIVER_CC3XX && PSA_CRYPTO_DRIVER_OBERON
 
 # Spake2+ support
 config MBEDTLS_MD_C
     default y
 
-endif
+endif # CHIP_CRYPTO_PSA
 
 if !CHIP_CRYPTO_PSA
 
@@ -366,7 +371,7 @@ config MBEDTLS_ECP_C
 config MBEDTLS_ECP_DP_SECP256R1_ENABLED
     default y
 
-endif
+endif # !CHIP_CRYPTO_PSA
 
 config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
     default n if CHIP_WIFI
@@ -486,4 +491,4 @@ config OPENTHREAD_SHELL
 
 endif # SHELL
 
-endif
+endif # CHIP

config/nrfconnect/chip-module/Kconfig.features

@@ -42,15 +42,13 @@ config CHIP_WIFI
 
 config CHIP_QSPI_NOR
 	bool "Enable QSPI NOR feature set"
+	imply NORDIC_QSPI_NOR
 	help
 	  Enables QSPI NOR flash with a set of options for configuring pages and
 	  buffer sizes.
 
 if CHIP_QSPI_NOR
 
-config NORDIC_QSPI_NOR
-	default y
-
 config NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE
 	default 16
 

config/nrfconnect/chip-module/Kconfig.mcuboot.defaults

@@ -19,16 +19,7 @@
 config MAIN_STACK_SIZE
     default 10240
 
-config BOOT_SWAP_SAVE_ENCTLV
-    default n
-
-config BOOT_ENCRYPT_RSA
-    default n
-
-config BOOT_ENCRYPT_EC256
-    default n
-
-config BOOT_ENCRYPT_X25519
+config BOOT_ENCRYPT_IMAGE
     default n
 
 config BOOT_BOOTSTRAP
@@ -53,9 +44,6 @@ if BOARD_NRF7002DK_NRF5340_CPUAPP
 config SPI
     default y
 
-config SPI_NOR
-    default y
-
 choice SPI_NOR_SFDP
 	default SPI_NOR_SFDP_DEVICETREE
 endchoice
@@ -74,9 +62,6 @@ endif
 # All boards beside nRF7002DK use QSPI NOR external flash
 if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
 
-config NORDIC_QSPI_NOR
-    default y
-
 config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
     default 4096
 

config/zephyr/Kconfig

@@ -309,7 +309,8 @@ config CHIP_PROJECT_CONFIG
 
 config CHIP_ENABLE_DNSSD_SRP
 	bool "OpenThread Service Registration Protocol"
-	default y if NET_L2_OPENTHREAD
+	default y
+	depends on NET_L2_OPENTHREAD
 	imply OPENTHREAD_ECDSA
 	imply OPENTHREAD_SRP_CLIENT
 	help
@@ -318,7 +319,8 @@ config CHIP_ENABLE_DNSSD_SRP
 
 config CHIP_ENABLE_DNS_CLIENT
 	bool "OpenThread DNS client"
-	default y if NET_L2_OPENTHREAD
+	default y
+	depends on NET_L2_OPENTHREAD
 	imply OPENTHREAD_DNS_CLIENT
 	help
 	  Enables using the OpenThread DNS client for the Matter service discovery.
@@ -413,6 +415,7 @@ config CHIP_THREAD_SSED
 
 config CHIP_OPENTHREAD_CONFIG
 	string "Custom OpenThread configuration file"
+	depends on NET_L2_OPENTHREAD
 	help
 	  Provides a path to an OpenThread configuration file. The path can be
 	  either absolute or relative to the application directory. When this option

docs/guides/BUILDING.md

@@ -135,13 +135,20 @@ Complete the following steps:
 
 1. Reboot your Raspberry Pi after installing `pi-bluetooth`.
 
-#### Enable experimental Bluetooth support in BlueZ
+#### Enable experimental Bluetooth support and disable battery plugin in BlueZ
 
 The Matter application on Linux uses BlueZ to communicate with the Bluetooth
 controller. The BlueZ version that comes with Ubuntu 22.04 does not support all
 the features required by the Matter application by default. To enable these
 features, you need to enable experimental Bluetooth support in BlueZ.
 
+Also disable the battery plugin from BlueZ, because iOS devices advertises a
+battery service via BLE, which requires pairing if accessed. BlueZ includes a
+battery plugin by default which tries to connect to the battery service. The
+authentication fails, because in this case no BLE pairing has been done. If the
+BlueZ battery plugin is not disabled, the BLE connection will be terminated
+during the Matter commissioning process.
+
 1. Edit the `bluetooth.service` unit by running the following command:
 
     ```sh
@@ -153,7 +160,7 @@ features, you need to enable experimental Bluetooth support in BlueZ.
     ```ini
     [Service]
     ExecStart=
-    ExecStart=/usr/lib/bluetooth/bluetoothd -E
+    ExecStart=/usr/lib/bluetooth/bluetoothd -E -P battery
     ```
 
 1. Restart the Bluetooth service by running the following command:

docs/guides/README.md

@@ -18,8 +18,7 @@
 -   [nRF Connect - Factory Data Configuration](./nrfconnect_factory_data_configuration.md)
 -   [nRF Connect - Platform Overview](./nrfconnect_platform_overview.md)
 -   [nRF Connect - Software Update](./nrfconnect_examples_software_update.md)
--   [NXP - Android Commissioning](./nxp_k32w_android_commissioning.md)
--   [NXP - Linux Examples](./nxp_imx8m_linux_examples.md)
+-   [NXP - Getting Started Guide](./nxp/README.md)
 -   [Silicon Labs - Documentation](https://siliconlabs.github.io/matter/latest/index.html)
 -   [Silicon Labs - Getting Started](./silabs_getting_started.md)
 -   [Silicon Labs - Software Update](./silabs_efr32_software_update.md)

docs/guides/darwin.md

@@ -259,7 +259,7 @@ Example:
 -   [mbedOS](/examples/all-clusters-app/mbed/README.md)
 -   [nRF Connect All Clusters](./nrfconnect_examples_configuration.md)
 -   [nRF Connect Pump](/examples/pump-app/nrfconnect/README.md)
--   [NXP Examples](./nxp_imx8m_linux_examples.md)
+-   [NXP Examples](./nxp/nxp_imx8m_linux_examples.md)
 -   [NXP](/examples/all-clusters-app/nxp/mw320/README.md)
 -   [Infineon CYW30739 Lighting](/examples/lighting-app/infineon/cyw30739/README.md)
 -   [Infineon PSoC6](/examples/all-clusters-app/infineon/psoc6/README.md)

docs/guides/index.md

@@ -10,6 +10,7 @@ and features.
 
 *
 esp32/README
+nxp/README
 ti/ti_platform_overview
 ```
 
@@ -34,9 +35,7 @@ ti/ti_platform_overview
 -   [nRF Connect - Factory Data Configuration](./nrfconnect_factory_data_configuration.md)
 -   [nRF Connect - Platform Overview](./nrfconnect_platform_overview.md)
 -   [nRF Connect - Software Update](./nrfconnect_examples_software_update.md)
--   [NXP - Android Commissioning](./nxp_k32w_android_commissioning.md)
--   [NXP - Linux Examples](./nxp_imx8m_linux_examples.md)
--   [NXP - Manufacturing Data](./nxp_manufacturing_flow.md)
+-   [NXP - Getting Started Guide](./nxp/README.md)
 -   [Silicon Labs - Documentation](https://siliconlabs.github.io/matter/latest/index.html)
 -   [Silicon Labs - Getting Started](./silabs_getting_started.md)
 -   [Silicon Labs - Software Update](./silabs_efr32_software_update.md)

docs/guides/nxp/README.md

@@ -0,0 +1,14 @@
+```{toctree}
+:glob:
+:maxdepth: 1
+
+*
+```
+
+# NXP Getting Started Guide
+
+-   [NXP - Android Commissioning](nxp_k32w_android_commissioning.md)
+-   [NXP - Linux Examples](nxp_imx8m_linux_examples.md)
+-   [NXP - Manufacturing Data](nxp_manufacturing_flow.md)
+-   [NXP - RW61x OTA Software Update Guide](nxp_rw61x_ota_software_update.md)
+-   [NXP - Zephyr OTA Software Update Guide](nxp_zephyr_ota_software_update.md)

docs/guides/nxp_imx8m_linux_examples.md → docs/guides/nxp/nxp_imx8m_linux_examples.md

@@ -4,11 +4,11 @@ This document describes how to build below Linux examples with the NXP embedded
 Linux Yocto SDK and then run the output executable files on the **NXP i.MX 8M**
 **Mini EVK** development board.
 
--   [CHIP Linux All-clusters Example](../../examples/all-clusters-app/linux/README.md)
--   [CHIP Linux Lighting Example](../../examples/lighting-app/linux/README.md)
+-   [CHIP Linux All-clusters Example](../../../examples/all-clusters-app/linux/README.md)
+-   [CHIP Linux Lighting Example](../../../examples/lighting-app/linux/README.md)
 -   [CHIP Linux Thermostat Example](https://github.com/project-chip/connectedhomeip/tree/master/examples/thermostat/linux)
--   [CHIP Linux CHIP-tool Example](../../examples/chip-tool/README.md)
--   [CHIP Linux OTA-provider Example](../../examples/ota-provider-app/linux/README.md)
+-   [CHIP Linux CHIP-tool Example](../../../examples/chip-tool/README.md)
+-   [CHIP Linux OTA-provider Example](../../../examples/ota-provider-app/linux/README.md)
 
 This document has been tested on:
 
@@ -234,8 +234,8 @@ Thermostat-app is used as an example below.
 
     In order to test the CHIP protocol functions, another device on the same
     network is needed to run the
-    [ChipDeviceController](../../src/controller/python) tool to communicate with
-    the **i.MX 8M Mini EVK**.
+    [ChipDeviceController](../../../src/controller/python) tool to communicate
+    with the **i.MX 8M Mini EVK**.
 
     The ChipDeviceController can be a laptop / workstation. Bluetooth
     functionality is mandatory on this device.
@@ -252,7 +252,7 @@ Thermostat-app is used as an example below.
     -   Boot up Ubuntu on the Raspberry Pi
     -   Clone this connectedhomeip project
     -   Follow Python ChipDeviceController
-        [README.md](../../src/controller/python/README.md) document. Refer to
+        [README.md](../../../src/controller/python/README.md) document. Refer to
         the "Building and installing" part to build the tool.
 
 -   Running
@@ -283,7 +283,7 @@ Thermostat-app is used as an example below.
               /home/root/thermostat-app --ble-device 0 --wifi  # The bluetooth device used is hci0 and support wifi network
               ```
 
-    -   Run [ChipDeviceController](../../src/controller/python) on the
+    -   Run [ChipDeviceController](../../../src/controller/python) on the
         controller device to communicate with **i.MX 8M Mini EVK** running the
         example.