Merge branch 'nrfconnect:main' into patch-1

nrfconnect · Dec 6, 2024 · 75c2817 · 75c2817
2 parents 74c7f91 + 8528b92
commit 75c2817
Show file tree

Hide file tree

Showing 122 changed files with 1,634 additions and 1,167 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.8.99
+2.9.99
diff --git a/applications/ipc_radio/Kconfig b/applications/ipc_radio/Kconfig
@@ -40,6 +40,10 @@ config IPC_RADIO_BT_RPC
 
 endchoice # IPC_RADIO_BT_SER
 
+config SETTINGS
+	imply ZMS if SOC_FLASH_NRF_MRAM
+	imply NVS if !SOC_FLASH_NRF_MRAM
+
 config BT_MAX_CONN
 	default 4 if IPC_RADIO_802154
 	default 16 if !IPC_RADIO_802154

diff --git a/applications/ipc_radio/overlay-bt_rpc.conf b/applications/ipc_radio/overlay-bt_rpc.conf
@@ -21,7 +21,6 @@ CONFIG_BT_SETTINGS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-CONFIG_NVS=y
 CONFIG_SETTINGS=y
 
 CONFIG_IPC_RADIO_BT=y

diff --git a/applications/machine_learning/sample.yaml b/applications/machine_learning/sample.yaml
@@ -5,27 +5,34 @@ tests:
   applications.machine_learning.zdebug:
     sysbuild: true
     build_only: true
-    platform_allow: >
-      nrf52840dk/nrf52840 thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns
-      nrf5340dk/nrf5340/cpuapp
+    platform_allow:
+      - nrf52840dk/nrf52840
+      - thingy53/nrf5340/cpuapp
+      - thingy53/nrf5340/cpuapp/ns
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
       - thingy53/nrf5340/cpuapp
       - thingy53/nrf5340/cpuapp/ns
       - nrf5340dk/nrf5340/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     tags: ci_build sysbuild ci_applications_machine_learning
   applications.machine_learning.zdebug_nus:
     sysbuild: true
     build_only: true
-    platform_allow: nrf52840dk/nrf52840
+    platform_allow:
+      - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52840dk/nrf52840
     tags: ci_build sysbuild ci_applications_machine_learning
     extra_args: FILE_SUFFIX=nus
   applications.machine_learning.zdebug_rtt:
     sysbuild: true
     build_only: true
-    platform_allow: thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns
+    platform_allow:
+      - thingy53/nrf5340/cpuapp
+      - thingy53/nrf5340/cpuapp/ns
     integration_platforms:
       - thingy53/nrf5340/cpuapp
       - thingy53/nrf5340/cpuapp/ns
@@ -34,7 +41,10 @@ tests:
   applications.machine_learning.zrelease:
     sysbuild: true
     build_only: true
-    platform_allow: nrf52840dk/nrf52840 thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns
+    platform_allow:
+      - nrf52840dk/nrf52840
+      - thingy53/nrf5340/cpuapp
+      - thingy53/nrf5340/cpuapp/ns
     integration_platforms:
       - nrf52840dk/nrf52840
       - thingy53/nrf5340/cpuapp
@@ -44,7 +54,8 @@ tests:
   applications.machine_learning.sensor_hub.zdebug.singlecore:
     build_only: true
     sysbuild: true
-    platform_allow: nrf54h20dk/nrf54h20/cpuapp
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
     tags: ci_build sysbuild ci_applications_machine_learning
@@ -54,7 +65,8 @@ tests:
   applications.machine_learning.sensor_hub.zdebug:
     build_only: true
     sysbuild: true
-    platform_allow: nrf54h20dk/nrf54h20/cpuapp
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
     tags: ci_build sysbuild ci_applications_machine_learning

diff --git a/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c b/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c
@@ -83,6 +83,7 @@ static bool paused;
 static struct bt_csip_set_member_svc_inst *csip;
 
 static uint8_t flags_adv_data;
+static uint8_t bass_service_uuid[BT_UUID_SIZE_16];
 static uint8_t gap_appear_adv_data[BT_UUID_SIZE_16];
 static uint8_t csip_rsi_adv_data[BT_CSIP_RSI_SIZE];
 
@@ -144,6 +145,19 @@ int broadcast_sink_adv_populate(struct bt_data *adv_buf, uint8_t adv_buf_vacant)
 		}
 	}
 
+	/*
+	 * AD format required for broadcast sink with scan delegator.
+	 * Details can be found in Basic Audio Profile Section 3.9.2.
+	 */
+	sys_put_le16(BT_UUID_BASS_VAL, &bass_service_uuid[0]);
+
+	ret = bt_mgmt_adv_buffer_put(adv_buf, &adv_buf_cnt, adv_buf_vacant,
+				     sizeof(bass_service_uuid), BT_DATA_SVC_DATA16,
+				     (void *)bass_service_uuid);
+	if (ret) {
+		return ret;
+	}
+
 	sys_put_le16(CONFIG_BT_DEVICE_APPEARANCE, &gap_appear_adv_data[0]);
 
 	ret = bt_mgmt_adv_buffer_put(adv_buf, &adv_buf_cnt, adv_buf_vacant,

diff --git a/...s/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/mcuboot_private.pem b/...s/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/mcuboot_private.pem
@@ -1,28 +1,3 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCi7guPvor+uIpE
-XrWftc/csrYkozi6Sm7V7J9iXogTdNvD/745Vnz6p/z5UOQkWZDnPaQXxCtZeMM4
-QHJ6eTLg8OoLfLSl7gx2NyAyIz4w4VnqkpT9wOVo5imJVJ19F6AEbnv9N07Uq8Ph
-bUMJWWFYSaObFlkCrETdU/OpuO927OIbsZEFnC4OlMSmjoASNsrcCD6ELyGhCpjU
-tRiDb6paDHJKnKzVMT7bGza9tRveTuQscs6D+Vn4jB1+ChhmAcuHsVm7Yzsz99yZ
-vQdLfLo4U6KKSPG/uvNX/jcBLLyohDy2h24q/+PXUTAWQ+PyVGXwuun6/hbYW1JM
-XYNGfUh7AgMBAAECggEAM9l9ZGlG4njnx4o8Um8RjzJwNIic7OvzCbEbp7pdo5N0
-vJMOfkC/1STQpKbRc5/tNSmwpr+O7BI6ThR0WfVn8523XaB5/LQc0yIH5OzCRdvx
-OW0cbQSN/SwB2+pJlB2IluByJMsNEzD2TS7wPnFrQSVuI1ShTvBzmdu1lzV7P2Tx
-Hj/2ZG3FV5wRT4Hed3/tkBtIYBJNxHkW/BP31XX2ndq7/Apyo471Ef9RMRBQUhOP
-7s+oYZJq95JUiMvlhGjg7Z7sShrvJ+VMMylBDUNK5fBCOBv70i21aXhz1Uf7i0l9
-751yfa5BQA10WigMOqgxC/1bpHOs4EVU+1fYG4rLwQKBgQDTk0CZ6ddTCdwRgsc2
-F1Bav+7c+AK+Sa+L58Mn7XOVjrL+cgenSHmcnEu/OTCq+xrOYV8ht1nf9uqfIg/p
-wiVwTEcLj8cQS0t7cLtttGzk9UFPEynsnzdlgXoImx2iobgwIAaSShPAbZjFpwPc
-7Ha1LwcfrSpa1s5Tm+NLTK5SRwKBgQDFI/jpTpWAtY6o+0g/KV363KdFIJ1XYE4+
-DxTZlxeGwR7OZhp84jo6cHG/ZK7YW6TKcmjriD5NyxD+w0aAiGKf4+xkpRbmCbYM
-/+SUgIV4pZ9u9LzGTapx9cTtIBiEugsTpP64yKiXgLbjhDXVsdpnjGacnr/7AAz6
-wNEt0eeeLQKBgQCREyV25FtbeyVFdJE4y9+zemxFZGItLMWMf0zYMf/Ri1m9E1+g
-GxgYhSuDYam3dBs7bJUYv2qHIf5bQ7X5qcCWMhd9HAd5asfFStWaMd+BV5KCsDdN
-IxePKKsO/53giFeN2EfpQ5Yrmnro/M6vTA1Ry39s/wZN54Du37OJTHkzvQKBgEfZ
-FWWKU2hmQwkJE8qZO/wqoPfLrCxlF/78JiArNdLR3XVhtvOey5Py2THk8ug9djCm
-Q+DbdcGKabY/2xkLG86kFcqUdGUAUw4n0NnigUJ4MkQRBB/NvHnuFYhKc0UkPNc7
-Ae68it00dvMygyBPwoaMn/Ui0lsbKJ/W2CW34489AoGAfBF0VLVLLCXq0P3vtuiX
-s+Bzi3UowjVI4+yBZdHpcm0pjzgiQmqoGWj0F3T5Jv8+5KVqfot9nWX3ePzS9zlJ
-XmagOt6W5I3JNtARdqEJusspCWbOOUkOJT9CLIWZsN5Zf9XPAWaJ7UrVOhhuktv2
-33zKWryP8cRkCFzxjK08f/o=
+MC4CAQAwBQYDK2VwBCIEIKLdbGhr2fWsJ8sHgZbPnO6RPGXoqq9ef064wxuB9L6h
 -----END PRIVATE KEY-----
diff --git a/...top/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/mcuboot_private_fast_pair.pem b/...top/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/mcuboot_private_fast_pair.pem
@@ -1,28 +1,3 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDcfrLhn9i+3T7+
-e30YQNSgfon86dSjVBFpShryxgRACr0P1QH9AznM04P1PQi+O37S2cfKZCXquHT0
-WipCmyywCQAo2Y2cLb0WJXNizRbgl3mEzRz8K1RjNvRFCYRgdbEKmA2w5x1/4nxQ
-8T+BjIQOvZeSCjf75imowzyCLgOr9mLHI9I6QVhriIAYc7og3WeFs5w+NoTACeqq
-hTsL0Uqe6aqITw1jrshSXPFrARYZhyK35UpCiMbjYxf2VsBSD26Q0GYdP9aGcfxp
-tK/lceyqlybHrThqEHDaKR6F+ByO8YV6JCkuq8JylFzKpmF4oyBmuXMn1NAHBSst
-nVDK9ZsJAgMBAAECggEAA8s3yXdKP813fSIzjrBl4C2RMv10e8txYcAFSu5SiiYN
-Jvm1pyxwKQiuJXDzhq9oIRlfbUlwGBPsqjwnbD42hIBhJPLKU5i7X0dNbxKjjUF5
-9Smg0StvMCZUyV/Oq+i2fz3KxYOSf73uQOfHvZNE/epv8lKz8CT/jEBwuPYw+LtU
-PP8koMV75R5l0XjpEt5Ko/xbDnxiBvBg2ZFQKpNFeLKLrN8wCPqo+uRW29p8dv7g
-vn+ERz6JC5vNU2qKVuBplE4ZTc1zQVp5aa65/dZPmtXH3a3jMy8iTBLPvYZtoSVP
-4HgNZI8dqrE5SMfbdWLsOYGTQgBXMhuEX2njP8/qgQKBgQD2vdOP9yqEwAt3hzWx
-MMBuZIb6mqrUNuiZegSZsL4lvYhcfPNTpweTY8MWmDOblnIwemfhQijnERdlLLUY
-2URnjR0wQ9WydhQg9rqh1rPkVAl2MxBlIHPBfwNzrKtDL+2DvY42y4IbbMn6A9gt
-u2SalkRdc8pmX/hzGkUzbkriiQKBgQDkxMARsqzhqlf1Gdwl4JBp7UV7KmJldXxJ
-9xzw9CH5qtyUlUA4RBYlgsa/vDhrrKKHDi5QZSGTOW2umEihY63kmVrQ2F0aJdNB
-F7zNta30jb8qBSGpsnqbYy6QS6eRTVInwac0K9K8Q8PdOkXRm9d0xm20CVLCxZ8Z
-M5ueLqDUgQKBgF7xmHDzSNcgFsl9q7ls6v8Pi6juzwEtx78W5qJFEkXvcoM0SWVN
-Bms+nhkZo/Igp/vjfgl9rcOMHhZ+Z4kSQXIfKLYjxB0Rtpkgl5wiw8H+XE2xRIPF
-QwWX3DosnRITZS+mRwzqrjvjVqzvwcWHMCUT4WacYauXDkEsQKiTrhkRAoGBAK7h
-JP6ievxLjs+kRCGEaIFBS5Ma1HtA85FLYYlk5zAHiHXhHmWkztVAApUB2pOdNeVO
-VuNIXAFCrnEAos0U+RK+lKkALTPW5IZnEgKjNuazEQabQ5+I+6cbi7Xsz50I4ZvY
-suvz8DXRC8JrUIIqwurW4Xf2hJi2H6hRRk4G0RWBAoGBAOf7BEFMSH8QxPEiRmh4
-VcHLb3Otm7goH2tvqgzYu2Pzh42SwaT9JmTZkLX5IZI+MfUSuBmfxSFLfF2yfJqQ
-uYa7hpU4w0wAgOq26HTiY2Ge3y8FTiasl4xuJ2VDBqZbvL8Zk0MW2MDtUwVMlm0A
-ISrmLsUtfP8DvhZ0hIUPt+xl
+MC4CAQAwBQYDK2VwBCIEIO0APC5gA+HO8JhqUJ0AK+fgF4MbbXhrfPmXlqU+LPhD
 -----END PRIVATE KEY-----
diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/prj.conf
@@ -8,8 +8,6 @@ CONFIG_SIZE_OPTIMIZATIONS=y
 CONFIG_HW_STACK_PROTECTION=y
 
 CONFIG_MAIN_STACK_SIZE=10240
-CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
-
 CONFIG_BOOT_MAX_IMG_SECTORS=256
 CONFIG_BOOT_BOOTSTRAP=n
 

diff --git a/...ns/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/prj_fast_pair.conf b/...ns/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/prj_fast_pair.conf
@@ -8,7 +8,6 @@ CONFIG_SIZE_OPTIMIZATIONS=y
 CONFIG_HW_STACK_PROTECTION=y
 
 CONFIG_MAIN_STACK_SIZE=10240
-CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_MAX_IMG_SECTORS=256
 CONFIG_BOOT_BOOTSTRAP=n

diff --git a/...ons/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf b/...ons/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf
@@ -8,7 +8,6 @@ CONFIG_SIZE_OPTIMIZATIONS=y
 CONFIG_HW_STACK_PROTECTION=y
 
 CONFIG_MAIN_STACK_SIZE=10240
-CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_MAX_IMG_SECTORS=256
 CONFIG_BOOT_BOOTSTRAP=n

diff --git a/...ions/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf b/...ions/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf
@@ -8,7 +8,6 @@ CONFIG_SIZE_OPTIMIZATIONS=y
 CONFIG_HW_STACK_PROTECTION=y
 
 CONFIG_MAIN_STACK_SIZE=10240
-CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_MAX_IMG_SECTORS=256
 CONFIG_BOOT_BOOTSTRAP=n

diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/pm_static.yml b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/pm_static.yml
@@ -1,46 +1,46 @@
 app:
-  address: 0x5800
+  address: 0x7800
   region: flash_primary
-  size: 0xb9800
+  size: 0xb8800
 mcuboot:
   address: 0x0
   region: flash_primary
-  size: 0x5000
+  size: 0x7000
 mcuboot_pad:
-  address: 0x5000
+  address: 0x7000
   region: flash_primary
   size: 0x800
 mcuboot_primary:
-  address: 0x5000
+  address: 0x7000
   orig_span: &id001
   - app
   - mcuboot_pad
   region: flash_primary
-  size: 0xba000
+  size: 0xb9000
   span: *id001
 mcuboot_primary_app:
-  address: 0x5800
+  address: 0x7800
   orig_span: &id002
   - app
   region: flash_primary
-  size: 0xb9800
+  size: 0xb8800
   span: *id002
 mcuboot_secondary:
-  address: 0xbf000
+  address: 0xc0000
   orig_span: &id003
   - mcuboot_secondary_pad
   - mcuboot_secondary_app
   region: flash_primary
-  size: 0xba000
+  size: 0xb9000
   span: *id003
 mcuboot_secondary_pad:
   region: flash_primary
-  address: 0xbf000
+  address: 0xc0000
   size: 0x800
 mcuboot_secondary_app:
   region: flash_primary
-  address: 0xbf800
-  size: 0xb9800
+  address: 0xc0800
+  size: 0xb8800
 settings_storage:
   address: 0x179000
   region: flash_primary

diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/pm_static_fast_pair.yml b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/pm_static_fast_pair.yml
@@ -1,46 +1,46 @@
 app:
-  address: 0x5800
+  address: 0x7800
   region: flash_primary
-  size: 0xb8800
+  size: 0xb7800
 mcuboot:
   address: 0x0
   region: flash_primary
-  size: 0x5000
+  size: 0x7000
 mcuboot_pad:
-  address: 0x5000
+  address: 0x7000
   region: flash_primary
   size: 0x800
 mcuboot_primary:
-  address: 0x5000
+  address: 0x7000
   orig_span: &id001
   - app
   - mcuboot_pad
   region: flash_primary
-  size: 0xb9000
+  size: 0xb8000
   span: *id001
 mcuboot_primary_app:
-  address: 0x5800
+  address: 0x7800
   orig_span: &id002
   - app
   region: flash_primary
-  size: 0xb8800
+  size: 0xb7800
   span: *id002
 mcuboot_secondary:
-  address: 0xbe000
+  address: 0xbf000
   orig_span: &id003
   - mcuboot_secondary_pad
   - mcuboot_secondary_app
   region: flash_primary
-  size: 0xb9000
+  size: 0xb8000
   span: *id003
 mcuboot_secondary_pad:
   region: flash_primary
-  address: 0xbe000
+  address: 0xbf000
   size: 0x800
 mcuboot_secondary_app:
   region: flash_primary
-  address: 0xbe800
-  size: 0xb8800
+  address: 0xbf800
+  size: 0xb7800
 bt_fast_pair:
   address: 0x177000
   region: flash_primary

diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/pm_static_keyboard.yml b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/pm_static_keyboard.yml
@@ -1,46 +1,46 @@
 app:
-  address: 0x5800
+  address: 0x7800
   region: flash_primary
-  size: 0xb9800
+  size: 0xb8800
 mcuboot:
   address: 0x0
   region: flash_primary
-  size: 0x5000
+  size: 0x7000
 mcuboot_pad:
-  address: 0x5000
+  address: 0x7000
   region: flash_primary
   size: 0x800
 mcuboot_primary:
-  address: 0x5000
+  address: 0x7000
   orig_span: &id001
   - app
   - mcuboot_pad
   region: flash_primary
-  size: 0xba000
+  size: 0xb9000
   span: *id001
 mcuboot_primary_app:
-  address: 0x5800
+  address: 0x7800
   orig_span: &id002
   - app
   region: flash_primary
-  size: 0xb9800
+  size: 0xb8800
   span: *id002
 mcuboot_secondary:
-  address: 0xbf000
+  address: 0xc0000
   orig_span: &id003
   - mcuboot_secondary_pad
   - mcuboot_secondary_app
   region: flash_primary
-  size: 0xba000
+  size: 0xb9000
   span: *id003
 mcuboot_secondary_pad:
   region: flash_primary
-  address: 0xbf000
+  address: 0xc0000
   size: 0x800
 mcuboot_secondary_app:
   region: flash_primary
-  address: 0xbf800
-  size: 0xb9800
+  address: 0xc0800
+  size: 0xb8800
 settings_storage:
   address: 0x179000
   region: flash_primary