Revert "[nrf noup] boards: nordic: nrf7002dk: Bring back NS variants"

This reverts commit ba6e93a.

Signed-off-by: Jonathan Nilsen <[email protected]>

Author: jonathannilsen

boards/nordic/nrf7002dk/CMakeLists.txt

@@ -10,9 +10,7 @@ config MBOX_NRFX_IPC
 	default MBOX
 
 if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
 
 config BT_HCI_IPC
 	default y if BT

boards/nordic/nrf7002dk/Kconfig

@@ -4,6 +4,4 @@
 config BOARD_NRF7002DK
 	select SOC_NRF5340_CPUNET_QKAA if BOARD_NRF7002DK_NRF5340_CPUNET
 	select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001

boards/nordic/nrf7002dk/Kconfig.defconfig

@@ -1,24 +1,10 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
-  set(TFM_PUBLIC_KEY_FORMAT "full")
-endif()
-
-if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
   board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/support/nrf7002dk_spi_nrfutil_config.json")
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
-endif()
-
-if(CONFIG_TFM_FLASH_MERGED_BINARY)
-  set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex")
-endif()
-
-if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
+elseif(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 

boards/nordic/nrf7002dk/Kconfig.nrf7002dk

@@ -5,9 +5,5 @@ board:
   socs:
     - name: nrf5340
       variants:
-        - name: ns
-          cpucluster: cpuapp
         - name: nrf7001
           cpucluster: cpuapp
-          variants:
-            - name: ns