Skip to content

Commit 51c1e45

Browse files
carlescufidleach02
carlescufi
authored and
dleach02
committed
soc: nordic: Remove the nRF54L15 EngA
The production version of the nRF54L15 SoC is now available, so remove the initial Engineering A (EngA) preview version. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
1 parent cb47c62 commit 51c1e45

17 files changed

+5
-3476
lines changed

‎drivers/mbox/mbox_nrf_vevif_event_rx.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@
1010

1111
#include <haly/nrfy_vpr.h>
1212

13-
#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP)
14-
#define EVENTS_IDX_MIN 11U
15-
#define EVENTS_IDX_MAX 17U
16-
#else
1713
#define EVENTS_IDX_MIN NRF_VPR_EVENTS_TRIGGERED_MIN
1814
#define EVENTS_IDX_MAX NRF_VPR_EVENTS_TRIGGERED_MAX
19-
#endif
2015

2116
/* callbacks */
2217
struct mbox_vevif_event_rx_cbs {

‎drivers/mbox/mbox_nrf_vevif_event_tx.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212
#include <hal/nrf_vpr_csr.h>
1313
#include <hal/nrf_vpr_csr_vevif.h>
1414

15-
#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR)
16-
#define EVENTS_IDX_MAX 17U
17-
#else
1815
#define EVENTS_IDX_MAX NRF_VPR_EVENTS_TRIGGERED_MAX
19-
#endif
2016

2117
#define VEVIF_EVENTS_NUM DT_INST_PROP(0, nordic_events)
2218
#define VEVIF_EVENTS_MASK DT_INST_PROP(0, nordic_events_mask)

‎drivers/mbox/mbox_nrf_vevif_task_rx.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,8 @@
1212
#include <hal/nrf_vpr_csr.h>
1313
#include <hal/nrf_vpr_csr_vevif.h>
1414

15-
#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR)
16-
#define TASKS_IDX_MIN 11U
17-
#define TASKS_IDX_MAX 17U
18-
#else
1915
#define TASKS_IDX_MIN NRF_VPR_TASKS_TRIGGER_MIN
2016
#define TASKS_IDX_MAX NRF_VPR_TASKS_TRIGGER_MAX
21-
#endif
2217

2318
#define VEVIF_TASKS_NUM DT_INST_PROP(0, nordic_tasks)
2419
#define VEVIF_TASKS_MASK DT_INST_PROP(0, nordic_tasks_mask)

‎drivers/mbox/mbox_nrf_vevif_task_tx.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010

1111
#include <haly/nrfy_vpr.h>
1212

13-
#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP)
14-
#define TASKS_IDX_MAX 17U
15-
#else
1613
#define TASKS_IDX_MAX NRF_VPR_TASKS_TRIGGER_MAX
17-
#endif
1814

1915
struct mbox_vevif_task_tx_conf {
2016
NRF_VPR_Type *vpr;

‎drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
#include <zephyr/toolchain.h>
1515

1616
#include <hal/nrf_vpr.h>
17-
#if (defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP)) && \
18-
!defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
17+
#if defined(CONFIG_SOC_NRF54L15_CPUAPP) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
1918
#include <hal/nrf_spu.h>
2019
#endif
2120

@@ -42,8 +41,7 @@ static int nordic_vpr_launcher_init(const struct device *dev)
4241
}
4342
#endif
4443

45-
#if (defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP)) && \
46-
!defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
44+
#if defined(CONFIG_SOC_NRF54L15_CPUAPP) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
4745
nrf_spu_periph_perm_secattr_set(NRF_SPU00, nrf_address_slave_get((uint32_t)config->vpr),
4846
true);
4947
#endif

‎dts/arm/nordic/nrf54l15_enga_cpuapp.dtsi

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎dts/riscv/nordic/nrf54l15_enga_cpuflpr.dtsi

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎modules/hal_nordic/nrfx/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR NRF54H20_ENGB_X
5252
NRF_PPR)
5353
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR NRF54H20_ENGB_XXAA
5454
NRF_FLPR)
55-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA NRF54L15_ENGA_XXAA)
56-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP NRF_APPLICATION)
57-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR NRF_FLPR)
5855
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15 NRF54L15_XXAA)
5956
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP NRF_APPLICATION)
6057
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR NRF_FLPR)
@@ -179,7 +176,7 @@ if(DEFINED uicr_path)
179176
endif()
180177
endif()
181178

182-
if(CONFIG_SOC_NRF54L15_ENGA_CPUAPP OR CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
179+
if(CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
183180
dt_prop(clock_frequency PATH "/cpus/cpu@0" PROPERTY "clock-frequency")
184181
math(EXPR clock_frequency_mhz "${clock_frequency} / 1000000")
185182
zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
@@ -233,8 +230,6 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP nrf54h20_engb_application.svd)
233230
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR nrf54h20_engb_ppr.svd)
234231
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR nrf54h20_engb_flpr.svd)
235232
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD nrf54h20_engb_radiocore.svd)
236-
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP nrf54l15_enga_application.svd)
237-
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR nrf54l15_enga_flpr.svd)
238233
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP nrf54l15_application.svd)
239234
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR nrf54l15_flpr.svd)
240235
mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)

‎modules/hal_nordic/nrfx/nrfx_config.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,10 +1056,6 @@
10561056
#include <nrfx_config_nrf54h20_ppr.h>
10571057
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
10581058
#include <nrfx_config_nrf54h20_flpr.h>
1059-
#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_APPLICATION)
1060-
#include <nrfx_config_nrf54l15_enga_application.h>
1061-
#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_FLPR)
1062-
#include <nrfx_config_nrf54l15_enga_flpr.h>
10631059
#elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)
10641060
#include <nrfx_config_nrf54l15_application.h>
10651061
#elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)

0 commit comments

Comments
 (0)