Skip to content

Commit 89c4f0f

Browse files
mstasiaknordicrlubos
authored andcommitted
soc: cleanup nRF54LM20A mentions
nRF54LM20A has been moved upstream. Signed-off-by: Michał Stasiak <[email protected]>
1 parent d4e4d8a commit 89c4f0f

File tree

6 files changed

+2
-51
lines changed

6 files changed

+2
-51
lines changed

soc/nordic/common/vpr/Kconfig.sysbuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
config VPR_LAUNCHER
55
bool "VPR launcher"
66
default y
7-
depends on (SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR)
7+
depends on SOC_NRF54LV10A_ENGA_CPUFLPR
88
help
99
Include VPR launcher in build.
1010
VPR launcher is a minimal sample built for an ARM core that starts given VPR core.

soc/nordic/nrf54l/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ endif()
1818
zephyr_include_directories(${ZEPHYR_BASE}/soc/nordic/nrf54l)
1919
add_subdirectory(${ZEPHYR_BASE}/soc/nordic/common ${CMAKE_BINARY_DIR}/common)
2020

21-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20A_ENGA NRF_SKIP_TAMPC_SETUP)
22-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20A_ENGA NRF54LM20A_ENGA_XXAA)
23-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20A_ENGA_CPUAPP NRF_APPLICATION)
24-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20A_ENGA_CPUFLPR NRF_FLPR)
25-
2621
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LS05B_ENGA NRF_SKIP_TAMPC_SETUP)
2722
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LS05B_ENGA NRF54LS05B_ENGA_XXAA)
2823
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LS05B_ENGA_CPUAPP NRF_APPLICATION)

soc/nordic/nrf54l/Kconfig

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ config SOC_NRF54LV10A_ENGA_CPUAPP
99
config SOC_NRF54LV10A_ENGA_CPUFLPR
1010
select RISCV_CORE_NORDIC_VPR
1111

12-
config SOC_NRF54LM20A_ENGA_CPUAPP
13-
select SOC_NRF54L_CPUAPP_COMMON
14-
15-
config SOC_NRF54LM20A_ENGA_CPUFLPR
16-
select RISCV_CORE_NORDIC_VPR
17-
1812
config SOC_NRF54LS05B_ENGA_CPUAPP
1913
select ARM
2014
select CPU_CORTEX_M33

soc/nordic/nrf54l/Kconfig.defconfig.nrf54lv10a_enga_cpuapp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Nordic Semiconductor nRF54LM20A MCU
1+
# Nordic Semiconductor nRF54LV10A MCU
22

33
# Copyright (c) 2024 Nordic Semiconductor ASA
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause

soc/nordic/nrf54l/Kconfig.soc

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,6 @@
33
# Copyright (c) 2024 Nordic Semiconductor ASA
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55

6-
config SOC_NRF54LM20A
7-
bool
8-
select SOC_SERIES_NRF54LX
9-
help
10-
NRF54LM20A
11-
12-
config SOC_NRF54LM20A_ENGA
13-
bool
14-
select SOC_NRF54LM20A
15-
help
16-
NRF54LM20A ENGA
17-
18-
config SOC_NRF54LM20A_ENGA_CPUAPP
19-
bool
20-
select SOC_NRF54LM20A_ENGA
21-
help
22-
NRF54LM20A ENGA CPUAPP
23-
24-
config SOC_NRF54LM20A_ENGA_CPUFLPR
25-
bool
26-
select SOC_NRF54LM20A_ENGA
27-
help
28-
NRF54LM20A ENGA CPUFLPR
29-
306
config SOC_NRF54LS05B
317
bool
328
select SOC_SERIES_NRF54LX
@@ -70,6 +46,5 @@ config SOC_NRF54LV10A_ENGA_CPUFLPR
7046
NRF54LV10A ENGA CPUFLPR
7147

7248
config SOC
73-
default "nrf54lm20a" if SOC_NRF54LM20A
7449
default "nrf54ls05b" if SOC_NRF54LS05B
7550
default "nrf54lv10a" if SOC_NRF54LV10A

soc/nordic/soc.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ family:
99
- name: cpuflpr
1010
- name: nrf54l
1111
socs:
12-
- name: nrf54lm20a
13-
cpuclusters:
14-
- name: cpuapp
15-
- name: cpuflpr
1612
- name: nrf54ls05b
1713
cpuclusters:
1814
- name: cpuapp
@@ -30,9 +26,6 @@ runners:
3026
- qualifiers:
3127
- nrf54lv10a/cpuapp
3228
- nrf54lv10a/cpuflpr
33-
- qualifiers:
34-
- nrf54lm20a/cpuapp
35-
- nrf54lm20a/cpuflpr
3629
- qualifiers:
3730
- nrf54ls05b/cpuapp
3831
'--erase':
@@ -44,9 +37,6 @@ runners:
4437
- qualifiers:
4538
- nrf54lv10a/cpuapp
4639
- nrf54lv10a/cpuflpr
47-
- qualifiers:
48-
- nrf54lm20a/cpuapp
49-
- nrf54lm20a/cpuflpr
5040
- qualifiers:
5141
- nrf54ls05b/cpuapp
5242
'--reset':
@@ -64,8 +54,5 @@ runners:
6454
- qualifiers:
6555
- nrf54lv10a/cpuapp
6656
- nrf54lv10a/cpuflpr
67-
- qualifiers:
68-
- nrf54lm20a/cpuapp
69-
- nrf54lm20a/cpuflpr
7057
- qualifiers:
7158
- nrf54ls05b/cpuapp

0 commit comments

Comments
 (0)