Revert "[nrf noup] boards: Add non-secure target for nrf54L15dk"

This reverts commit 6b48f84.

Signed-off-by: Gerard Marull-Paretas <[email protected]>

Author: gmarull

boards/nordic/nrf54l15dk/Kconfig

@@ -13,21 +13,3 @@ config ROM_START_OFFSET
 
 endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
 	# BOARD_NRF54L15DK_NRF54L15_CPUAPP
-
-if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
-
-config BT_CTLR
-	default BT
-
-# By default, if we build for a Non-Secure version of the board,
-# enable building with TF-M as the Secure Execution Environment.
-config BUILD_WITH_TFM
-	default y if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
-
-# By default, if we build with TF-M, instruct build system to
-# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
-config TFM_FLASH_MERGED_BINARY
-	default y
-	depends on BUILD_WITH_TFM
-
-endif #BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS

boards/nordic/nrf54l15dk/Kconfig.defconfig

@@ -4,6 +4,6 @@
 config BOARD_NRF54L15DK
 	select SOC_NRF54L05_CPUAPP if BOARD_NRF54L15DK_NRF54L05_CPUAPP
 	select SOC_NRF54L10_CPUAPP if BOARD_NRF54L15DK_NRF54L10_CPUAPP
-	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
+	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP
 	select SOC_NRF54L15_CPUFLPR if BOARD_NRF54L15DK_NRF54L15_CPUFLPR || \
 					    BOARD_NRF54L15DK_NRF54L15_CPUFLPR_XIP

boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk

@@ -9,13 +9,5 @@ elseif(CONFIG_SOC_NRF54L05_CPUFLPR OR CONFIG_SOC_NRF54L10_CPUFLPR OR
   board_runner_args(jlink "--speed=4000")
 endif()
 
-if(BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS)
-  set(TFM_PUBLIC_KEY_FORMAT "full")
-endif()
-
-if(CONFIG_TFM_FLASH_MERGED_BINARY)
-  set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
-endif()
-
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

boards/nordic/nrf54l15dk/board.cmake

@@ -9,5 +9,3 @@ board:
     variants:
     - name: xip
       cpucluster: cpuflpr
-    - name: ns
-      cpucluster: cpuapp