Skip to content

Commit 6e3914c

Browse files
committed
upmerge: tests: updates related to Zephyr upmerge
- nrf_security: update mbedtls heap to const struct device Zephyr upmerge introduces device bindings const struct as part of: zephyrproject-rtos/zephyr#24873 This const'ify mbedtls_heap.c init function. - mpls: Added `select MULTITHREADING_LOCK` to Kconfig With the changes related to: nrfconnect/sdk-nrf#2861 zephyrproject-rtos/zephyr#27398 The mpsl clock control is no longer needed, but mpsl still requires MULTITHREADING_LOCK, and is therefore moved to its right location. Signed-off-by: Torsten Rasmussen <[email protected]>
1 parent 7ab7c9f commit 6e3914c

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

mpsl/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ config MPSL
1010
select ZERO_LATENCY_IRQS
1111
select IEEE802154_NRF5_EXT_IRQ_MGMT if IEEE802154_NRF5
1212
select NRF_802154_MULTIPROTOCOL_SUPPORT if NRF_802154_RADIO_DRIVER
13+
select MULTITHREADING_LOCK
1314
depends on (SOC_SERIES_NRF52X || SOC_SERIES_NRF53X)
1415
help
1516
Use Nordic Multi Protocol Service Layer (MPSL) implementation,

nrf_security/src/mbedtls/mbedtls_heap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
static unsigned char mbedtls_heap[CONFIG_MBEDTLS_HEAP_SIZE];
1717

18-
static int mbedtls_heap_init(struct device *dev)
18+
static int mbedtls_heap_init(const struct device *dev)
1919
{
2020
ARG_UNUSED(dev);
2121

0 commit comments

Comments
 (0)