frkv · PerMac · Jan 2, 2025 · Dec 30, 2024 · Dec 30, 2024 · Jan 2, 2025
diff --git a/.checkpatch.conf b/.checkpatch.conf
@@ -5,7 +5,6 @@
 --min-conf-desc-length=1
 --typedefsfile=scripts/checkpatch/typedefsfile
 
---ignore BRACES
 --ignore PRINTK_WITHOUT_KERN_LEVEL
 --ignore SPLIT_STRING
 --ignore VOLATILE

diff --git a/.github/workflows/docbuild.yml b/.github/workflows/docbuild.yml
@@ -147,7 +147,7 @@ jobs:
 
           for docset in "${DOXYGEN[@]}"; do
             OUTDIR=doc/_build/html-doxygen/$docset-apis
-            mv doc/_build/html/$docset "$OUTDIR"
+            mv doc/_build/html/$docset/html "$OUTDIR"
 
             # Populate custom.properties, tags.yml
             cp doc/_zoomin/$docset.apis.custom.properties "$OUTDIR/custom.properties"

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -362,7 +362,6 @@
 /include/net/download_client*             @nrfconnect/ncs-modem
 /include/net/downloader*                  @nrfconnect/ncs-modem
 /include/net/nrf_cloud_*                  @nrfconnect/ncs-nrf-cloud
-/include/net/wifi_credentials.h           @nrfconnect/ncs-cia
 /include/nfc/                             @nrfconnect/ncs-co-drivers @nrfconnect/ncs-si-muffin
 /include/nrf_compress/                    @nordicjm
 /include/nrf_rpc/                         @nrfconnect/ncs-co-drivers @nrfconnect/ncs-si-muffin
@@ -777,7 +776,6 @@
 /subsys/net/lib/nrf_cloud/                @nrfconnect/ncs-nrf-cloud
 /subsys/net/lib/nrf_provisioning/         @nrfconnect/ncs-iot-oulu
 /subsys/net/lib/zzhc/                     @junqingzou
-/subsys/net/lib/wifi_credentials/         @nrfconnect/ncs-cia
 /subsys/net/lib/softap_wifi_provision/    @nrfconnect/ncs-cia
 /subsys/net/openthread/                   @nrfconnect/ncs-co-networking @nrfconnect/ncs-thread
 /subsys/net/openthread/rpc/               @nrfconnect/ncs-protocols-serialization
@@ -889,7 +887,6 @@
 /tests/subsys/net/lib/mqtt_helper/        @nrfconnect/ncs-cia
 /tests/subsys/net/lib/nrf_cloud/          @nrfconnect/ncs-nrf-cloud
 /tests/subsys/net/lib/nrf_provisioning/   @nrfconnect/ncs-iot-oulu
-/tests/subsys/net/lib/wifi_credentials*/  @nrfconnect/ncs-cia
 /tests/subsys/net/lib/tls_credentials*/   @nrfconnect/ncs-co-networking
 /tests/subsys/net/openthread/rpc/         @nrfconnect/ncs-protocols-serialization
 /tests/subsys/nfc/rpc/                    @nrfconnect/ncs-protocols-serialization

diff --git a/Kconfig.nrf b/Kconfig.nrf
@@ -60,9 +60,9 @@ config NET_SOCKETS_OFFLOAD_TLS
 #  - For CC3XX RNG
 #  - For Cracen RNG
 config MAIN_STACK_SIZE
+	default 3584 if PSA_NEED_CRACEN_CTR_DRBG_DRIVER && !BUILD_WITH_TFM
 	default 2048 if ZTEST
 	default 2048 if ENTROPY_CC3XX && !BUILD_WITH_TFM
-	default 2048 if PSA_NEED_CRACEN_CTR_DRBG_DRIVER && !BUILD_WITH_TFM
 
 config ZTEST_STACK_SIZE
 	default 2048 if ZTEST
@@ -113,6 +113,19 @@ config FLASH_SIZE
 	default 1524
 endif
 
+config NRF_SECURITY_ENABLER
+	def_bool y
+	imply NRF_SECURITY if BT_CRYPTO || BT_HOST_CRYPTO || BT_MESH_USES_MBEDTLS_PSA || BT_FAST_PAIR_CRYPTO_PSA
+	imply ENTROPY_GENERATOR if BOARD_NATIVE_SIM || BT_HOST_CRYPTO_PRNG || BT_ECC
+	imply PSA_WANT_GENERATE_RANDOM if BT_HOST_CRYPTO_PRNG || BT_ECC
+	imply MBEDTLS_ENABLE_HEAP if BT_HOST_CRYPTO_PRNG || BT_ECC
+	depends on !SOC_NRF5340_CPUNET
+
+if SOC_SERIES_BSIM_NRFXX && ENTROPY_GENERATOR
+config MBEDTLS_HEAP_SIZE
+	int
+	default 2048
+endif
 
 rsource "samples/Kconfig"
 rsource "subsys/Kconfig"

diff --git a/applications/asset_tracker_v2/overlay-lwm2m.conf b/applications/asset_tracker_v2/overlay-lwm2m.conf
@@ -13,6 +13,9 @@ CONFIG_LWM2M_RW_JSON_SUPPORT=n
 CONFIG_LWM2M_SECURITY_INSTANCE_COUNT=3
 CONFIG_COAP_INIT_ACK_TIMEOUT_MS=4000
 CONFIG_BASE64=y
+CONFIG_POSIX_API=y
+CONFIG_ZVFS_EVENTFD=y
+CONFIG_ZVFS_EVENTFD_MAX=2
 
 # Transmission buffers.
 CONFIG_LWM2M_ENGINE_MAX_OBSERVER=5

diff --git a/applications/connectivity_bridge/boards/thingy91_nrf52840.conf b/applications/connectivity_bridge/boards/thingy91_nrf52840.conf
@@ -17,7 +17,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=251
 CONFIG_BT_NUS=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_SMP=y
-CONFIG_BT_CTLR=y
 CONFIG_BT_CTLR_RX_BUFFERS=10
 CONFIG_BT_BUF_ACL_TX_COUNT=10
 CONFIG_BT_BUF_ACL_TX_SIZE=251

diff --git a/applications/connectivity_bridge/boards/thingy91x_nrf5340_cpuapp.conf b/applications/connectivity_bridge/boards/thingy91x_nrf5340_cpuapp.conf
@@ -45,3 +45,18 @@ CONFIG_CMSIS_DAP_DEVICE_VENDOR="Nordic Semiconductor ASA"
 CONFIG_CMSIS_DAP_DEVICE_NAME="nrf91"
 
 CONFIG_BRIDGE_CMSIS_DAP_NORDIC_COMMANDS=y
+
+# Reduce BLE logging to save flash space
+CONFIG_BT_NUS_LOG_LEVEL_ERR=y
+CONFIG_BT_LOG_LEVEL_ERR=y
+CONFIG_BT_HCI_DRIVER_LOG_LEVEL_ERR=y
+CONFIG_BT_RPA_LOG_LEVEL_ERR=y
+CONFIG_BT_CRYPTO_LOG_LEVEL_ERR=y
+CONFIG_BT_ATT_LOG_LEVEL_ERR=y
+CONFIG_BT_GATT_LOG_LEVEL_ERR=y
+CONFIG_BT_L2CAP_LOG_LEVEL_ERR=y
+CONFIG_BT_HCI_CORE_LOG_LEVEL_ERR=y
+CONFIG_BT_CONN_LOG_LEVEL_ERR=y
+CONFIG_BT_KEYS_LOG_LEVEL_ERR=y
+CONFIG_BT_SMP_LOG_LEVEL_ERR=y
+CONFIG_BT_SERVICE_LOG_LEVEL_ERR=y
diff --git a/applications/connectivity_bridge/src/modules/ble_handler.c b/applications/connectivity_bridge/src/modules/ble_handler.c
@@ -222,7 +222,7 @@ static void adv_start(void)
 
 	err = bt_le_adv_start(
 		BT_LE_ADV_PARAM(
-			BT_LE_ADV_OPT_CONNECTABLE,
+			BT_LE_ADV_OPT_CONN,
 			BT_GAP_ADV_SLOW_INT_MIN,
 			BT_GAP_ADV_SLOW_INT_MAX,
 			NULL),

diff --git a/applications/machine_learning/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/applications/machine_learning/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf
@@ -53,6 +53,7 @@ CONFIG_USB_CDC_ACM=y
 CONFIG_CBPRINTF_NANO=y
 CONFIG_TIMESLICING=n
 CONFIG_BOOT_BANNER=n
+CONFIG_NCS_BOOT_BANNER=n
 CONFIG_CONSOLE=n
 CONFIG_CONSOLE_HANDLER=n
 CONFIG_UART_CONSOLE=n

diff --git a/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay b/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -12,11 +12,6 @@
 	};
 };
 
-/* Set IPC thread priority to the highest value to not collide with other threads. */
-&ipc0 {
-	zephyr,priority = <0 PRIO_COOP>;
-};
-
 /* Disable unused peripherals to reduce power consumption */
 &adc {
 	status = "disabled";

diff --git a/applications/matter_weather_station/app.overlay b/applications/matter_weather_station/app.overlay
@@ -65,11 +65,6 @@
 	};
 };
 
-/* Set IPC thread priority to the highest value to not collide with other threads. */
-&ipc0 {
-    zephyr,priority = <0 PRIO_COOP>;
-};
-
 &i2c1 {
 	bme688@76 {
 		compatible = "bosch,bme680";

diff --git a/applications/nrf5340_audio/Kconfig b/applications/nrf5340_audio/Kconfig
@@ -39,24 +39,6 @@ config TRANSPORT_CIS
 endchoice
 
 #----------------------------------------------------------------------------#
-if (TRANSPORT_BIS && AUDIO_DEV = 1)
-rsource "broadcast_sink/Kconfig.defaults"
-endif # TRANSPORT_BIS && AUDIO_DEV = 1
-
-if (TRANSPORT_BIS && AUDIO_DEV = 2)
-rsource "broadcast_source/Kconfig.defaults"
-endif # TRANSPORT_BIS && AUDIO_DEV = 2
-
-if (TRANSPORT_CIS && AUDIO_DEV = 1)
-rsource "unicast_server/Kconfig.defaults"
-endif # TRANSPORT_CIS && AUDIO_DEV = 1
-
-if (TRANSPORT_CIS && AUDIO_DEV = 2)
-rsource "unicast_client/Kconfig.defaults"
-endif # TRANSPORT_CIS && AUDIO_DEV = 2
-
-
-
 rsource "Kconfig.defaults"
 rsource "src/audio/Kconfig"
 rsource "src/bluetooth/Kconfig"

diff --git a/applications/nrf5340_audio/broadcast_sink/Kconfig.defaults b/applications/nrf5340_audio/broadcast_sink/Kconfig.defaults
diff --git a/applications/nrf5340_audio/broadcast_sink/overlay-broadcast_sink.conf b/applications/nrf5340_audio/broadcast_sink/overlay-broadcast_sink.conf
@@ -0,0 +1,69 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_TRANSPORT_BIS=y
+
+## ACL related configs ##
+CONFIG_BT_OBSERVER=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_SMP=y
+CONFIG_BT_AUDIO=y
+CONFIG_BT_GATT_DYNAMIC_DB=y
+CONFIG_BT_GATT_CACHING=n
+
+CONFIG_SETTINGS=y
+CONFIG_BT_SETTINGS=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_NVS=y
+
+CONFIG_MBEDTLS_ENABLE_HEAP=y
+CONFIG_MBEDTLS_HEAP_SIZE=2048
+
+CONFIG_BT_BUF_ACL_TX_COUNT=18
+
+CONFIG_BT_CAP_ACCEPTOR=y
+CONFIG_BT_CSIP_SET_MEMBER=y
+CONFIG_BT_CAP_ACCEPTOR_SET_MEMBER=y
+CONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS=y
+CONFIG_BT_VCP_VOL_REND=y
+
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=64
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=69
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=200
+
+# Generic Audio Sink - 0x0840
+CONFIG_BT_DEVICE_APPEARANCE=2112
+CONFIG_BT_PER_ADV_SYNC_MAX=2
+
+## ISO related configs ##
+CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT=2
+CONFIG_BT_BAP_BROADCAST_SNK_COUNT=2
+CONFIG_BT_ISO_MAX_CHAN=2
+CONFIG_BT_ISO_MAX_BIG=2
+
+CONFIG_BT_PER_ADV_SYNC_TRANSFER_RECEIVER=y
+
+## PACS related configs ##
+CONFIG_BT_PAC_SNK_NOTIFIABLE=y
+CONFIG_BT_PAC_SNK=y
+CONFIG_BT_PAC_SRC_NOTIFIABLE=y
+CONFIG_BT_PAC_SRC=y
+
+## Audio related configs ##
+CONFIG_AUDIO_MUTE=n
+CONFIG_AUDIO_TEST_TONE=n
+
+CONFIG_BT_ISO_SYNC_RECEIVER=y
+CONFIG_BT_BAP_SCAN_DELEGATOR=y
+CONFIG_BT_BAP_BROADCAST_SINK=y
+
+## LC3 related configs ##
+CONFIG_LC3_DEC_CHAN_MAX=1
+
+
+
diff --git a/applications/nrf5340_audio/broadcast_source/overlay-broadcast_source.conf b/applications/nrf5340_audio/broadcast_source/overlay-broadcast_source.conf
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_TRANSPORT_BIS=y
+
+CONFIG_BT_CAP_INITIATOR=y
+CONFIG_BT_AUDIO=y
+
+CONFIG_BT_DEVICE_APPEARANCE=2181
+
+CONFIG_BT_ISO_BROADCASTER=y
+
+CONFIG_BT_BAP_BROADCAST_SOURCE=y
+
+CONFIG_BT_ISO_TX_BUF_COUNT=2
+
+CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2
+
+CONFIG_BT_ISO_MAX_CHAN=2
+
+CONFIG_BT_ISO_MAX_BIG=2
+
+CONFIG_LC3_ENC_CHAN_MAX=2
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/applications/nrf5340_audio/prj.conf b/applications/nrf5340_audio/prj.conf
@@ -17,6 +17,7 @@ CONFIG_STACK_USAGE=y
 CONFIG_THREAD_RUNTIME_STATS=y
 CONFIG_STACK_SENTINEL=y
 CONFIG_INIT_STACKS=y
+CONFIG_BT=y
 
 # Uart driver
 CONFIG_SERIAL=y