Skip to content

Commit 5928786

Browse files
committed
Revert "[nrf noup] boards: Add non-secure target for nrf54L15dk"
This reverts commit c9b6b6a. Reverting this noup now that we have the 54L15 NS board target upstream. Signed-off-by: Tomi Fontanilles <[email protected]>
1 parent a4c6476 commit 5928786

File tree

8 files changed

+1
-182
lines changed

8 files changed

+1
-182
lines changed

boards/nordic/nrf54l15dk/Kconfig

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

boards/nordic/nrf54l15dk/Kconfig.defconfig

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,3 @@ config ROM_START_OFFSET
1010

1111
endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
1212
# BOARD_NRF54L15DK_NRF54L15_CPUAPP
13-
14-
if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
15-
16-
config BT_CTLR
17-
default BT
18-
19-
# By default, if we build for a Non-Secure version of the board,
20-
# enable building with TF-M as the Secure Execution Environment.
21-
config BUILD_WITH_TFM
22-
default y if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
23-
24-
# By default, if we build with TF-M, instruct build system to
25-
# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
26-
config TFM_FLASH_MERGED_BINARY
27-
default y
28-
depends on BUILD_WITH_TFM
29-
30-
endif #BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS

boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
config BOARD_NRF54L15DK
55
select SOC_NRF54L05_CPUAPP if BOARD_NRF54L15DK_NRF54L05_CPUAPP
66
select SOC_NRF54L10_CPUAPP if BOARD_NRF54L15DK_NRF54L10_CPUAPP
7-
select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
7+
select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP
88
select SOC_NRF54L15_CPUFLPR if BOARD_NRF54L15DK_NRF54L15_CPUFLPR || \
99
BOARD_NRF54L15DK_NRF54L15_CPUFLPR_XIP

boards/nordic/nrf54l15dk/board.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,5 @@ elseif(CONFIG_SOC_NRF54L05_CPUFLPR OR CONFIG_SOC_NRF54L10_CPUFLPR OR CONFIG_SOC_
88
board_runner_args(jlink "--device=RISC-V" "--speed=4000" "-if SW" "--tool-opt=-jlinkscriptfile ${JLINKSCRIPTFILE}")
99
endif()
1010

11-
if(BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS)
12-
set(TFM_PUBLIC_KEY_FORMAT "full")
13-
endif()
14-
15-
if(CONFIG_TFM_FLASH_MERGED_BINARY)
16-
set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
17-
endif()
18-
1911
include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
2012
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

boards/nordic/nrf54l15dk/board.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ board:
99
variants:
1010
- name: xip
1111
cpucluster: cpuflpr
12-
- name: ns
13-
cpucluster: cpuapp

boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts

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

boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml

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

boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig

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

0 commit comments

Comments
 (0)