Skip to content

Commit 43ef9d8

Browse files
57300thst-nordic
authored andcommitted
nrf_modem_lib: Fix SHMEM CTRL address
It was using the `cpuapp_cpucell_ipc_shm` node, which no longer exists. Use the matching `cpuapp_cpucell_ipc_shm_ctrl` node instead, and add a build assert on CONFIG_NRF_MODEM_LIB_SHMEM_CTRL_SIZE for good measure. Signed-off-by: Grzegorz Swiderski <[email protected]>
1 parent a9543c9 commit 43ef9d8

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

lib/nrf_modem_lib/nrf_modem_lib.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static const struct nrf_modem_bootloader_init_params bootloader_init_params = {
7777

7878
static const struct nrf_modem_init_params init_params = {
7979
.shmem.ctrl = {
80-
.base = DT_REG_ADDR(DT_NODELABEL(cpuapp_cpucell_ipc_shm)),
80+
.base = DT_REG_ADDR(DT_NODELABEL(cpuapp_cpucell_ipc_shm_ctrl)),
8181
.size = CONFIG_NRF_MODEM_LIB_SHMEM_CTRL_SIZE,
8282
},
8383
.shmem.tx = {
@@ -91,6 +91,12 @@ static const struct nrf_modem_init_params init_params = {
9191
.fault_handler = nrf_modem_fault_handler,
9292
.dfu_handler = nrf_modem_lib_dfu_handler,
9393
};
94+
95+
BUILD_ASSERT(
96+
CONFIG_NRF_MODEM_LIB_SHMEM_CTRL_SIZE <=
97+
DT_REG_SIZE(DT_NODELABEL(cpuapp_cpucell_ipc_shm_ctrl)),
98+
"CONFIG_NRF_MODEM_LIB_SHMEM_CTRL_SIZE exceeds 'cpuapp_cpucell_ipc_shm_ctrl' in devicetree");
99+
94100
#endif /* CONFIG_SOC_SERIES_NRF92X */
95101

96102
#if CONFIG_NRF_MODEM_LIB_TRACE

0 commit comments

Comments
 (0)