Skip to content

Commit a9a4995

Browse files
magp-nordicmasz-nordic
authored andcommitted
platform:ext: target: nordic_nrf: common: align to nrfx 4.0
Signed-off-by: Magdalena Pastula <magdalena.pastula@nordicsemi.no>
1 parent abd54bd commit a9a4995

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

platform/ext/target/nordic_nrf/common/core/target_cfg_54l.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ static void init_mpc_region_override(struct mpc_region_override *override)
129129
override->permmask = MPC_OVERRIDE_PERM_SECATTR_Msk;
130130
}
131131

132-
static nrfx_err_t rramc_configuration(void)
132+
static int rramc_configuration(void)
133133
{
134134
nrfx_rramc_config_t config = NRFX_RRAMC_DEFAULT_CONFIG(WRITE_BUFFER_SIZE);
135135

@@ -148,12 +148,12 @@ static nrfx_err_t rramc_configuration(void)
148148
*/
149149
nrfx_rramc_evt_handler_t handler = NULL;
150150

151-
nrfx_err_t err = nrfx_rramc_init(&config, handler);
152-
if (err != NRFX_SUCCESS && err != NRFX_ERROR_ALREADY) {
151+
int err = nrfx_rramc_init(&config, handler);
152+
if (err != 0 && err != -EALREADY) {
153153
return err;
154154
}
155155

156-
return NRFX_SUCCESS;
156+
return 0;
157157
}
158158

159159
enum tfm_plat_err_t init_debug(void)
@@ -469,8 +469,8 @@ enum tfm_plat_err_t spu_periph_init_cfg(void)
469469

470470
nrf_cache_enable(NRF_ICACHE);
471471

472-
nrfx_err_t nrfx_err = rramc_configuration();
473-
if (nrfx_err != NRFX_SUCCESS) {
472+
int nrfx_err = rramc_configuration();
473+
if (nrfx_err != 0) {
474474
return TFM_PLAT_ERR_SYSTEM_ERR;
475475
}
476476

0 commit comments

Comments
 (0)