Merge branch 'master' into telink_flash_optimization_and_use_swap_move

project-chip · Jan 4, 2023 · 78cd399 · 78cd399
2 parents 03ba586 + 0f3039f
commit 78cd399
Show file tree

Hide file tree

Showing 352 changed files with 7,583 additions and 6,463 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/.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/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.