Merge branch 'master' into telink_image_update

Author: s07641069

.github/workflows/build.yaml

@@ -332,7 +332,7 @@ jobs:
                   scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
                   scripts/run_in_build_env.sh 'virtualenv pyenv'
                   source pyenv/bin/activate
-                  pip3 install -r src/setup_payload/python/requirements.txt
+                  pip3 install -r scripts/setup/requirements.setuppayload.txt
                   python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
 
     build_linux_python_lighting_device:

.github/workflows/tests.yaml

@@ -94,9 +94,12 @@ template("chip_test_suite") {
 
     deps = [ dir_pw_unit_test ]
 
-    if (current_os != "zephyr" && current_os != "mbed") {
+    if (current_os != "zephyr" && current_os != "mbed" &&
+        chip_device_platform != "efr32") {
       # Depend on stdio logging, and have it take precedence over the default platform backend
-      public_deps += [ "${chip_root}/src/platform/logging:force_stdio" ]
+      public_deps += [ "${chip_root}/src/platform/logging:stdio" ]
+    } else {
+      public_deps += [ "${chip_root}/src/platform/logging:default" ]
     }
   }
   if (chip_link_tests) {

build/chip/chip_test_suite.gni

@@ -18,6 +18,11 @@ import("//build_overrides/chip.gni")
 import("${chip_root}/build/chip/tools.gni")
 import("${chip_root}/src/platform/device.gni")
 
+declare_args() {
+  # Build monolithic test library.
+  chip_monolithic_tests = false
+}
+
 declare_args() {
   # Enable building tests.
   chip_build_tests = current_os != "freertos"

build/chip/tests.gni

@@ -77,6 +77,7 @@ macro(matter_build target)
         LIB_PW_RPC
         LIB_MBEDTLS
         DEVICE_INFO_EXAMPLE_PROVIDER
+        FORCE_LOGGING_STDIO
     )
     set(multiValueArgs GN_DEPENDENCIES)
 
@@ -85,7 +86,11 @@ macro(matter_build target)
     set(MATTER_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/lib)
 
     # Prepare Matter libraries that the application should be linked with
-    set(MATTER_LIBRARIES -lCHIP)
+    if (FORCE_LOGGING_STDIO)
+        set(MATTER_LIBRARIES -lCHIPWithStdioLogging)
+    else()
+        set(MATTER_LIBRARIES -lCHIP)
+    endif()
 
     if (ARG_LIB_MBEDTLS)
         list(APPEND MATTER_LIBRARIES -lmbedtls)

config/common/cmake/chip_gn.cmake

@@ -237,7 +237,7 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
         COMMAND
         cp ${PROJECT_BINARY_DIR}/../modules/connectedhomeip/build_mcuboot/zephyr/zephyr.bin ${PROJECT_BINARY_DIR}/zephyr.mcuboot.bin
     )
-
+    add_dependencies(build_mcuboot ${ZEPHYR_FINAL_EXECUTABLE})
     set(BLOCK_SIZE "1024")
     dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
     dt_reg_size(mcuboot_size PATH ${dts_partition_path})
@@ -249,7 +249,7 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
         COMMAND
         dd if=${PROJECT_BINARY_DIR}/${ZEPHYR_OUTPUT_NAME}.bin of=${PROJECT_BINARY_DIR}/zephyr_full.bin bs=${BLOCK_SIZE} seek=${boot_blocks}
     )
-    add_dependencies(merge_mcuboot ${ZEPHYR_FINAL_EXECUTABLE})
+    add_dependencies(merge_mcuboot build_mcuboot)
 
     if (CONFIG_CHIP_OTA_IMAGE_BUILD)
         chip_ota_image(chip-ota-image

config/nxp/chip-module/CMakeLists.txt

@@ -205,7 +205,7 @@ config BT_BUF_ACL_TX_SIZE
 
 config BT_RX_STACK_SIZE
 	default 2048 if NO_OPTIMIZATIONS && DEBUG
-	default 1536
+	default 1600
 
 config BT_DEVICE_NAME_GATT_WRITABLE
 	bool
@@ -217,6 +217,9 @@ config HCI_NXP_ENABLE_AUTO_SLEEP
 config CHIP_OTA_REQUESTOR
 	default n
 
+config CHIP_DEVICE_SOFTWARE_VERSION
+	default 1
+
 # Enable extended discovery
 config CHIP_EXTENDED_DISCOVERY
 	default y
@@ -225,7 +228,7 @@ config NVS_LOOKUP_CACHE
 	default y
 
 config NVS_LOOKUP_CACHE_SIZE
-	default 512
+	default 1024
 
 if CHIP_WIFI
 

config/nxp/chip-module/Kconfig.defaults

@@ -79,6 +79,7 @@ matter_build(chip
     LIB_SHELL   ${CONFIG_CHIP_LIB_SHELL}
     LIB_TESTS   ${CONFIG_CHIP_LIB_TESTS}
     GN_DEPENDENCIES ${CONFIG_GN_DEPENDENCIES}
+    FORCE_LOGGING_STDIO ${CONFIG_CHIP_FORCE_LOGGING_STDIO}
 )
 
 target_link_libraries(chip INTERFACE

config/openiotsdk/CMakeLists.txt

@@ -27,6 +27,7 @@ set(CONFIG_CHIP_PROJECT_CONFIG_INCLUDE_DIRS "" CACHE STRING "")
 set(CONFIG_CHIP_LIB_TESTS NO CACHE BOOL "")
 set(CONFIG_CHIP_LIB_SHELL NO CACHE BOOL "")
 
+set(CONFIG_CHIP_FORCE_LOGGING_STDIO NO CACHE BOOL "Enable stdio logging backend")
 set(CONFIG_CHIP_DETAIL_LOGGING YES CACHE BOOL "Enable logging at detail level")
 set(CONFIG_CHIP_PROGRESS_LOGGING YES CACHE BOOL "Enable logging at progress level")
 set(CONFIG_CHIP_AUTOMATION_LOGGING YES CACHE BOOL "Enable logging at automation level")

config/openiotsdk/cmake/chip.cmake

@@ -157,9 +157,9 @@ The same procedure can be followed from the
 sub-section, replacing `CONFIG_CHIP_DEVICE_SOFTWARE_VERSION` with a number
 greater than the initial one used on the active application (Candidate
 application version number should be greater than the one used on the active
-application). By default the value is set to 0, try resetting this option to 1
+application). By default the value is set to 1, try resetting this option to 2
 to generate the OTA update Image. You can do this by adding
-`-DCONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1` to the west build command.
+`-DCONFIG_CHIP_DEVICE_SOFTWARE_VERSION=2` to the west build command.
 
 The current implementation automates the following procedures:
 

docs/guides/nxp/nxp_zephyr_ota_software_update.md

@@ -100,6 +100,7 @@ ti_simplelink_executable("air-purifier_app") {
     "${chip_root}/examples/air-purifier-app/air-purifier-common",
     "${chip_root}/examples/platform/cc32xx:cc32xx-attestation-credentials",
     "${chip_root}/src/lib",
+    "${chip_root}/src/platform/logging:default",
     "${chip_root}/src/setup_payload",
   ]
 

examples/air-purifier-app/cc32xx/BUILD.gn

@@ -108,6 +108,7 @@ asr_executable("clusters_app") {
     "${chip_root}/examples/common/QRCode",
     "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/src/lib",
+    "${chip_root}/src/platform/logging:default",
     "${chip_root}/src/setup_payload",
   ]
 

examples/all-clusters-app/asr/BUILD.gn

@@ -91,6 +91,7 @@ ti_simplelink_executable("all-clusters-app") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common",
     "${chip_root}/examples/platform/cc13x4_26x4:cc13x4_26x4-attestation-credentials",
     "${chip_root}/src/lib",
+    "${chip_root}/src/platform/logging:default",
     "${chip_root}/third_party/openthread:openthread",
   ]
   defines = []

examples/all-clusters-app/cc13x4_26x4/BUILD.gn

@@ -138,6 +138,7 @@ psoc6_executable("clusters_app") {
     "${chip_root}/examples/common/QRCode",
     "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/src/lib",
+    "${chip_root}/src/platform/logging:default",
     "${chip_root}/src/setup_payload",
   ]
 

examples/all-clusters-app/infineon/psoc6/BUILD.gn

@@ -63,7 +63,10 @@ mw320_executable("shell_mw320") {
     "${chip_root}/src/setup_payload",
   ]
 
-  deps = [ "${chip_root}/src/platform:syscalls_stub" ]
+  deps = [
+    "${chip_root}/src/platform:syscalls_stub",
+    "${chip_root}/src/platform/logging:default",
+  ]
 
   include_dirs = [
     "${chip_root}/src/platform/nxp/mw320",

examples/all-clusters-app/nxp/mw320/BUILD.gn

@@ -168,10 +168,12 @@ rt_executable("all_cluster_app") {
     "${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
     "${common_example_dir}/icd/source/ICDUtil.cpp",
     "${common_example_dir}/matter_button/source/AppMatterButtonEmpty.cpp",
-    "${common_example_dir}/matter_cli/source/AppMatterCli.cpp",
   ]
 
-  deps = [ "${chip_root}/examples/${app_common_folder}" ]
+  deps = [
+    "${chip_root}/examples/${app_common_folder}",
+    "${chip_root}/src/platform/logging:default",
+  ]
 
   sources += [
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
@@ -185,6 +187,10 @@ rt_executable("all_cluster_app") {
       "${chip_root}/examples/shell/shell_common:shell_common",
       "${chip_root}/src/lib/shell:shell",
     ]
+    sources += [
+      "${common_example_dir}/matter_cli/source/AppCLIBase.cpp",
+      "${common_example_dir}/matter_cli/source/AppCLIFreeRTOS.cpp",
+    ]
   }
 
   if (chip_enable_ota_requestor) {

examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn

@@ -94,6 +94,7 @@ asr_executable("clusters_minimal_app") {
     "${chip_root}/examples/common/QRCode",
     "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/src/lib",
+    "${chip_root}/src/platform/logging:default",
     "${chip_root}/src/setup_payload",
   ]
 

examples/all-clusters-minimal-app/asr/BUILD.gn

@@ -126,6 +126,7 @@ psoc6_executable("clusters_minimal_app") {
     "${chip_root}/examples/common/QRCode",
     "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/src/lib",
+    "${chip_root}/src/platform/logging:default",
     "${chip_root}/src/setup_payload",
   ]
 

examples/all-clusters-minimal-app/infineon/psoc6/BUILD.gn

@@ -95,6 +95,7 @@ asr_executable("bridge_app") {
     "${chip_root}/examples/common/QRCode",
     "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/src/lib",
+    "${chip_root}/src/platform/logging:default",
     "${chip_root}/src/setup_payload",
   ]