Merge branch 'master' into telink_flash_optimization_and_use_swap_move

config/nrfconnect/chip-module/Kconfig

@@ -18,6 +18,10 @@ rsource "../../zephyr/Kconfig"
 
 if CHIP
 
+# See config/zephyr/Kconfig for full definition
+config CHIP_DEVICE_VENDOR_NAME
+	default "Nordic Semiconductor ASA"
+
 config CHIP_APP_LOG_LEVEL
 	int "Set logging level in application"
 	default LOG_DEFAULT_LEVEL
@@ -159,140 +163,6 @@ config CHIP_DEVICE_GENERATE_ROTATING_DEVICE_UID
 
 endif #CHIP_FACTORY_DATA_BUILD
 
-# Factory data parameters
-config CHIP_DEVICE_SERIAL_NUMBER
-	string "Serial number of device"
-	default "11223344556677889900"
-	help
-	  A serial number parameter defines an unique number of manufactured device.
-	  Maximum length of serial number is 32 characters.
-
-config CHIP_DEVICE_VENDOR_NAME
-	string "Human-readable vendor name"
-	default "Nordic Semiconductor ASA"
-	help
-	  A human-readable vendor name which provides a simple string 
-	  containing identification of device's vendor for the Content APP.
-	  This information should be included in the Matter Basic Cluster.
-
-config CHIP_DEVICE_PRODUCT_NAME
-	string "Human-readable product name"
-	default "not-specified"
-	help
-	  A human-readable product name which provides a simple string 
-	  containing identification of the product for the Content APP.
-
-config CHIP_DEVICE_MANUFACTURING_DATE
-	string "Manufacturing date in ISO 8601"
-	default "2022-01-01"
-	help
-	  A manufacturing date specifies the date that the device was manufactured.
-	  The format used for providing a manufacturing date is ISO 8601 e.g. YYYY-MM-DD.
-
-config CHIP_DEVICE_HARDWARE_VERSION
-	int "Integer representation of hardware version"
-	default 0
-	help
-	  A hardware version number specifies the version number
-	  of the hardware of the device. The meaning of its value, 
-	  and the versioning scheme, are vendor defined.
-
-config CHIP_DEVICE_HARDWARE_VERSION_STRING
-	string "user-friendly string representation of hardware version"
-	default "prerelease"
-	help
-	  A hardware version string parameter specifies the version
-	  of the hardware of the device as a more user-friendly value
-	  than that represented by the hardware version integer value.
-	  The meaning of its value, and the versioning scheme, are
-	  vendor defined.
-
-config CHIP_DEVICE_DISCRIMINATOR
-	hex "Device pairing discriminator"
-	default 0xF00
-	help
-	  A 12-bit value matching the field of the same name in
-	  the setup code. Discriminator is used during
-	  a discovery process.
-
-config CHIP_DEVICE_SPAKE2_PASSCODE 
-	int "Spake2+ passcode"
-	default 20202021
-	range 1 99999998
-	help
-	  A pairing passcode is a 27-bit unsigned integer which serves
-	  as a proof of possession during commissioning. 
-	  Its value shall be restricted to the values 0x0000001 to 0x5F5E0FE
-	  (00000001 to 99999998 in decimal), excluding the invalid Passcode values:
-	  - 00000000, 11111111, 22222222, 33333333, 44444444, 55555555, 
-	  66666666, 77777777, 88888888, 99999999, 12345678, 87654321.
-
-config CHIP_DEVICE_SPAKE2_IT
-	int "Spake2+ iteration count"
-	default 1000
-	help
-	  The Spake2 iteration count is associated with the ephemeral
-	  PAKE passcode verifier to be used for the commissioning.
-	  The iteration count is used as a crypto parameter to process
-	  spake2 verifier.
-
-config CHIP_DEVICE_SPAKE2_SALT
-	string "Spake2+ salt in string format"
-	default "U1BBS0UyUCBLZXkgU2FsdA=="
-	help
-	  The spake2 salt is random data that is used as an additional input 
-	  to a one-way function that “hashes” data. 
-	  A new salt should be randomly generated for each password.
-	  The minimum length of spake2 salt is 16 Bytes.
-	  The maximum length of spake2 salt is 32 Bytes.
-
-config CHIP_DEVICE_SPAKE2_TEST_VERIFIER
-	string "Testing spake2+ verifier"
-	default "uWFwqugDNGiEck/po7KHwwMwwqZgN10XuyBajPGuyzUEV/iree4lOrao5GuwnlQ65CJzbeUB49s31EH+NEkg0JVI5MGCQGMMT/SRPFNRODm3wH/MBiehuFc6FJ/NH6Rmzw=="
-	help
-	  The spake 2 verifier generated using default SPAKE2 salt, 
-	  iteration count and passcode. This value can be used for development
-	  or testing purposes.
-	  Generated with: 
-	  spake2p gen-verifier -o - -i 1000 -s "U1BBS0UyUCBLZXkgU2FsdA==" -p 20202021
-
-config CHIP_DEVICE_ROTATING_DEVICE_UID
-	string  "A rotating device id unique id"
-	default "91a9c12a7c80700a31ddcfa7fce63e44"
-	help
-	  A device rotating id unique id which will be generated if
-	  this config is not set in prj.conf file.
-
-config CHIP_DEVICE_ENABLE_KEY
-	string "Enable Key for triggering test actions on device"
-	default "00112233445566778899AABBCCDDEEFF"
-	help
-	  The Enable Key is a 128-bit value that triggers test action 
-	  while invoking the TestEventTrigger Command. 
-	  Pattern: "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	  This value is used during Certification Tests,
-	  and should not be present on production devices.
-
-config CHIP_CERTIFICATION_DECLARATION_STORAGE
-	bool "Enable storing Certification Declaration"
-	depends on CHIP_FACTORY_DATA
-	help
-	  Enables storing Certification Declaration in Zephyr settings
-	  instead of using hardcoded value from firmware. It also adds
-	  support for including new Certification Declaration into a firmware
-	  update image package sent via OTA Software Update.
-
-if CHIP_CERTIFICATION_DECLARATION_STORAGE
-
-config CHIP_CERTIFiCATION_DECLARATION_OTA_IMAGE_ID
-	int "Certification declaration OTA image id"
-	default 205 #0xcd
-	help
-	  The image id of Certification Declaration image
-	  for sending it via OTA Software Update purposes.
-
-endif
-
 # See config/zephyr/Kconfig for full definition
 config CHIP_FACTORY_RESET_ERASE_NVS
 	bool

config/nrfconnect/chip-module/Kconfig.defaults

@@ -60,11 +60,6 @@ config SHELL
     bool
     default y
 
-# Enable getting reboot reasons information
-config HWINFO
-    bool
-    default y
-
 # Generic networking options
 config NET_SOCKETS_POSIX_NAMES
     bool
@@ -79,14 +74,6 @@ config INIT_STACKS
     bool
     default y
 
-config CHIP_DEVICE_VENDOR_ID
-	int
-	default 65521
-
-config CHIP_DEVICE_PRODUCT_ID
-	int
-	default 32768
-
 # Disable certain parts of Zephyr IPv6 stack
 config NET_IPV6_NBR_CACHE
     bool

config/nrfconnect/chip-module/Kconfig.features

@@ -25,10 +25,6 @@ config CHIP_WIFI
 	select WIFI_NRF700X
 	select WIFI
 	select WPA_SUPP
-	imply FLASH
-	imply SETTINGS
-	imply NVS
-	imply FLASH_MAP
 	imply NORDIC_SECURITY_BACKEND
 	imply MBEDTLS_ENTROPY_C
 	imply MBEDTLS_PSA_CRYPTO_C
@@ -85,29 +81,20 @@ config CHIP_DFU_OVER_BT_SMP
 	imply CHIP_QSPI_NOR if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
 	imply CHIP_SPI_NOR if BOARD_NRF7002DK_NRF5340_CPUAPP
 	imply BOOTLOADER_MCUBOOT
+	select MCUMGR
+	select MCUMGR_SMP_BT
+	select MCUMGR_CMD_IMG_MGMT
+	select MCUMGR_CMD_OS_MGMT
+	# Enable custom SMP request to erase settings partition.
+	select MCUMGR_GRP_ZEPHYR_BASIC if SOC_SERIES_NRF53X
+	select MCUMGR_GRP_BASIC_CMD_STORAGE_ERASE if SOC_SERIES_NRF53X
 	help
 		Enables Device Firmware Upgrade over Bluetoot LE with SMP
 		and configures set of options related to that feature.
 
 if CHIP_DFU_OVER_BT_SMP
 
 # MCU Manager and SMP configuration
-config MCUMGR
-	bool
-	default y
-
-config MCUMGR_CMD_IMG_MGMT
-	bool
-	default y
-
-config MCUMGR_CMD_OS_MGMT
-	bool
-	default y
-
-config MCUMGR_SMP_BT
-	bool
-	default y
-
 config MCUMGR_SMP_BT_AUTHEN
 	bool
 	default n
@@ -137,12 +124,6 @@ config SYSTEM_WORKQUEUE_STACK_SIZE
 
 if SOC_SERIES_NRF53X
 
-# FLASH nop device is enabled to prevent bus faults when mcumgr tries to access
-# simulated partition with network core image data.
-config FLASH_NOP_DEVICE
-	bool
-	default y
-
 # Enable custom SMP request to erase settings partition.
 config MCUMGR_GRP_ZEPHYR_BASIC
 	bool