boards: nordic: nrf7002dk: Remove NS variants

The NS variants need crypto changes from NCS, so, remove it from upstream till their support is upstreamed. Signed-off-by: Chaitanya Tata <[email protected]>
nrfconnect · Oct 11, 2024 · 10d4973 · 10d4973
1 parent 9472f84
commit 10d4973
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 275 deletions.
diff --git a/boards/nordic/nrf7002dk/CMakeLists.txt b/boards/nordic/nrf7002dk/CMakeLists.txt
@@ -2,9 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 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) AND
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001) AND
    CONFIG_BOARD_ENABLE_CPUNET)
   zephyr_library()
   zephyr_library_sources(nrf5340_cpunet_reset.c)

diff --git a/boards/nordic/nrf7002dk/Kconfig b/boards/nordic/nrf7002dk/Kconfig
@@ -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
@@ -60,9 +58,7 @@ config BT_ECC
 config DOMAIN_CPUAPP_BOARD
 	string
 	default "nrf7002dk/nrf5340/cpuapp" if BOARD_NRF7002DK_NRF5340_CPUAPP
-	default "nrf7002dk/nrf5340/cpuapp/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NS
 	default "nrf7002dk/nrf5340/cpuapp/nrf7001" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
-	default "nrf7002dk/nrf5340/cpuapp/nrf7001/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
 	help
 	  The board which will be used for CPUAPP domain when creating a multi
 	  image application where one or more images should be located on

diff --git a/boards/nordic/nrf7002dk/Kconfig.defconfig b/boards/nordic/nrf7002dk/Kconfig.defconfig
diff --git a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
@@ -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
diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
@@ -1,22 +1,11 @@
 # 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)
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
   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)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()

diff --git a/boards/nordic/nrf7002dk/board.yml b/boards/nordic/nrf7002dk/board.yml
@@ -5,9 +5,5 @@ board:
   socs:
     - name: nrf5340
       variants:
-        - name: ns
-          cpucluster: cpuapp
         - name: nrf7001
           cpucluster: cpuapp
-          variants:
-            - name: ns
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig