Skip to content

Commit a708cca

Browse files
nika-nordichenrikbrixandersen
authored andcommitted
modules: hal_nordic: nrfx: align nRF54L09/L20 symbols to new scheme
MDK 8.70.0 introduced following changes in the device naming: - renamed nRF54L20 Eng A to nRF54LM20A Eng A - renamed nRF54L09 Eng A to nRF54LV10A Eng A Actual SoC renaming will happen in followup PR. Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
1 parent 7319cc8 commit a708cca

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

modules/hal_nordic/nrfx/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05 NRF54L05_XXAA
4848
DEVELOP_IN_NRF54L15)
4949
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP NRF_APPLICATION)
5050
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR NRF_FLPR)
51-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA NRF54L09_ENGA_XXAA)
51+
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA NRF54LV10A_ENGA_XXAA)
5252
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP NRF_APPLICATION)
5353
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10 NRF54L10_XXAA
5454
DEVELOP_IN_NRF54L15)
@@ -59,7 +59,7 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP NRF_APPLICATION)
5959
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR NRF_FLPR)
6060
zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15 NRF54L15_XXAA)
6161
zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15_CPUAPP NRF_APPLICATION)
62-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA NRF54L20_ENGA_XXAA)
62+
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA NRF54LM20A_ENGA_XXAA)
6363
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP NRF_APPLICATION)
6464
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9120 NRF9120_XXAA)
6565
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9160 NRF9160_XXAA)
@@ -236,12 +236,12 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR nrf54h20_flpr.svd)
236236
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD nrf54h20_radiocore.svd)
237237
mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUAPP nrf54l05_application.svd)
238238
mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR nrf54l05_flpr.svd)
239-
mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP nrf54l09_enga_application.svd)
239+
mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP nrf54lv10a_enga_application.svd)
240240
mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUAPP nrf54l10_application.svd)
241241
mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR nrf54l10_flpr.svd)
242242
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP nrf54l15_application.svd)
243243
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR nrf54l15_flpr.svd)
244-
mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
244+
mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54lm20a_enga_application.svd)
245245
mdk_svd_ifdef(CONFIG_SOC_NRF9120 nrf9120.svd)
246246
mdk_svd_ifdef(CONFIG_SOC_NRF9160 nrf9160.svd)
247247
mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUAPP nrf9230_engb_application.svd)

modules/hal_nordic/nrfx/nrfx_config.h

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@
7878
#include <templates/nrfx_config_nrf54l05_application.h>
7979
#elif defined(NRF54L05_XXAA) && defined(NRF_FLPR)
8080
#include <templates/nrfx_config_nrf54l05_flpr.h>
81-
#elif defined(NRF54L09_ENGA_XXAA) && defined(NRF_APPLICATION)
82-
#include <templates/nrfx_config_nrf54l09_enga_application.h>
83-
#elif defined(NRF54L09_ENGA_XXAA) && defined(NRF_FLPR)
84-
#include <templates/nrfx_config_nrf54l09_enga_flpr.h>
8581
#elif defined(NRF54L10_XXAA) && defined(NRF_APPLICATION)
8682
#include <templates/nrfx_config_nrf54l10_application.h>
8783
#elif defined(NRF54L10_XXAA) && defined(NRF_FLPR)
@@ -90,14 +86,14 @@
9086
#include <templates/nrfx_config_nrf54l15_application.h>
9187
#elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
9288
#include <templates/nrfx_config_nrf54l15_flpr.h>
93-
#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_APPLICATION)
94-
#include <templates/nrfx_config_nrf54l15_enga_application.h>
95-
#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_FLPR)
96-
#include <templates/nrfx_config_nrf54l15_enga_flpr.h>
97-
#elif defined(NRF54L20_ENGA_XXAA) && defined(NRF_APPLICATION)
98-
#include <templates/nrfx_config_nrf54l20_enga_application.h>
99-
#elif defined(NRF54L20_ENGA_XXAA) && defined(NRF_FLPR)
100-
#include <templates/nrfx_config_nrf54l20_enga_flpr.h>
89+
#elif defined(NRF54LM20A_ENGA_XXAA) && defined(NRF_APPLICATION)
90+
#include <templates/nrfx_config_nrf54lm20a_enga_application.h>
91+
#elif defined(NRF54LM20A_ENGA_XXAA) && defined(NRF_FLPR)
92+
#include <templates/nrfx_config_nrf54lm20a_enga_flpr.h>
93+
#elif defined(NRF54LV10A_ENGA_XXAA) && defined(NRF_APPLICATION)
94+
#include <templates/nrfx_config_nrf54lv10a_enga_application.h>
95+
#elif defined(NRF54LV10A_ENGA_XXAA) && defined(NRF_FLPR)
96+
#include <templates/nrfx_config_nrf54lv10a_enga_flpr.h>
10197
#elif defined(NRF9120_XXAA) || defined(NRF9160_XXAA)
10298
#include <templates/nrfx_config_nrf91.h>
10399
#elif defined(NRF9230_ENGB_XXAA) && defined(NRF_APPLICATION)

0 commit comments

Comments
 (0)