Merge branch 'master' into sphinx_doc

project-chip · Jan 4, 2023 · 2fcfaf3 · 2fcfaf3
2 parents 07a13c1 + e3a3aaa
commit 2fcfaf3
Show file tree

Hide file tree

Showing 417 changed files with 10,621 additions and 9,242 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -54,7 +54,7 @@ AmebaZ
 amebaz2
 announcementReason
 AnnounceOTAProvider
-AnnounceOtaProviderRequest
+AnnounceOTAProviderRequest
 APIs
 apk
 AppConfig

diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
@@ -28,7 +28,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.24
+            image: connectedhomeip/chip-build:0.6.25
         defaults:
             run:
                 shell: sh

diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -29,7 +29,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.24
+            image: connectedhomeip/chip-build:0.6.25
         defaults:
             run:
                 shell: sh

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -621,12 +621,12 @@
                 "mbed-CY8CPROTO_062_4343W-shell-debug",
                 "mbed-CY8CPROTO_062_4343W-shell-develop",
                 "mbed-CY8CPROTO_062_4343W-shell-release",
-                "nrf-nrf52840-light",
-                "nrf-nrf52840-light-rpc",
-                "nrf-nrf52840-lock",
-                "nrf-nrf52840-pump",
-                "nrf-nrf52840-pump-controller",
-                "nrf-nrf52840-shell",
+                "nrf-nrf52840dk-light",
+                "nrf-nrf52840dk-light-rpc",
+                "nrf-nrf52840dk-lock",
+                "nrf-nrf52840dk-pump",
+                "nrf-nrf52840dk-pump-controller",
+                "nrf-nrf52840dk-shell",
                 "nrf-nrf5340-light",
                 "nrf-nrf5340-light-rpc",
                 "nrf-nrf5340-lock",

diff --git a/build_overrides/bouffalolab_iot_sdk.gni b/build_overrides/bouffalolab_iot_sdk.gni
@@ -13,11 +13,7 @@
 # limitations under the License.
 
 declare_args() {
-  # Root directory for bl602 SDK build files.
-  bl602_sdk_build_root = "//third_party/bouffalolab/bl602"
-
-  # Root directory for bl702 SDK build files.
-  bl702_sdk_build_root = "//third_party/bouffalolab/bl702"
+  bouffalolab_iot_sdk_build_root = "//third_party/bouffalolab/"
 
   bouffalolab_sdk_root = "/opt/bouffalolab_sdk"
 }
diff --git a/...d_party/bouffalolab/bl602/bl602_riscv.gni → config/bouffalolab/args.gni b/...d_party/bouffalolab/bl602/bl602_riscv.gni → config/bouffalolab/args.gni
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2022 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.
@@ -12,10 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("bl602_board.gni")
+# Options from standalone-chip.mk that differ from configure defaults. These
+# options are used from examples/.
 
-riscv_arch = "rv32imfc"
-riscv_abi = "ilp32f"
-#  riscv_cpu = ""
-#  riscv_float_abi = "hard"
-#  riscv_fpu = ""
+custom_toolchain =
+    "//third_party/connectedhomeip/config/bouffalolab/toolchain:riscv_gcc"
diff --git a/...orm/bouffalolab/common/toolchain/BUILD.gn → config/bouffalolab/toolchain/BUILD.gn b/...orm/bouffalolab/common/toolchain/BUILD.gn → config/bouffalolab/toolchain/BUILD.gn
diff --git a/...olab/common/toolchain/riscv_toolchain.gni → ...bouffalolab/toolchain/riscv_toolchain.gni b/...olab/common/toolchain/riscv_toolchain.gni → ...bouffalolab/toolchain/riscv_toolchain.gni
diff --git a/config/nrfconnect/chip-module/Kconfig b/config/nrfconnect/chip-module/Kconfig
@@ -169,3 +169,11 @@ config CHIP_FACTORY_RESET_ERASE_NVS
 	default y if CHIP_FACTORY_DATA || CHIP_FACTORY_DATA_CUSTOM_BACKEND
 
 endif
+
+config CHIP_LOG_SIZE_OPTIMIZATION
+	bool "Disable some detailed logs to decrease flash usage"
+	help
+	  Disables some log levels for the specific log modules
+	  providing detailed information that are not used in most cases.
+	  You can find full configuration enabled by this option
+	  in the platform/nrfconnect/CHIPPlatformConfig.h file.