[nrf fromlist] boards: rename thingy53_nrf5340_cpuappns

Upstream PR: zephyrproject-rtos/zephyr#38642 Change the 'ns' suffix to '_ns' for consistency with other boards. Signed-off-by: Martí Bolívar <[email protected]>
nrfconnect · Sep 20, 2021 · f19ebe4 · f19ebe4
1 parent 6bfc48e
commit f19ebe4
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/boards/arm/thingy53_nrf5340/CMakeLists.txt b/boards/arm/thingy53_nrf5340/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if (CONFIG_BOARD_THINGY53_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY53_NRF5340_CPUAPPNS)
+if (CONFIG_BOARD_THINGY53_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY53_NRF5340_CPUAPP_NS)
 	zephyr_library()
 	zephyr_library_sources(board.c)
 endif()
diff --git a/boards/arm/thingy53_nrf5340/Kconfig b/boards/arm/thingy53_nrf5340/Kconfig
@@ -52,7 +52,7 @@ config IPM_MSG_CH_1_RX
 
 endif # RPMSG_SERVICE_DUAL_IPM_SUPPORT
 
-if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPPNS
+if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 config BOARD_ENABLE_DCDC_APP
 	bool "Enable Application MCU DCDC converter"
@@ -93,7 +93,7 @@ config DOMAIN_CPUNET_BOARD
 	  another board. For example hci_rpmsg on the nRF5340_cpunet for
 	  Bluetooth applications.
 
-endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPPNS
+endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 if BOARD_THINGY53_NRF5340_CPUNET
 

diff --git a/boards/arm/thingy53_nrf5340/Kconfig.board b/boards/arm/thingy53_nrf5340/Kconfig.board
@@ -8,7 +8,7 @@ if SOC_NRF5340_CPUAPP_QKAA
 config BOARD_THINGY53_NRF5340_CPUAPP
 	bool "Thingy53 nRF5340 Application MCU"
 
-config BOARD_THINGY53_NRF5340_CPUAPPNS
+config BOARD_THINGY53_NRF5340_CPUAPP_NS
 	bool "Thingy53 nRF5340 Application MCU non-secure"
 
 endif # SOC_NRF5340_CPUAPP_QKAA

diff --git a/boards/arm/thingy53_nrf5340/Kconfig.defconfig b/boards/arm/thingy53_nrf5340/Kconfig.defconfig
@@ -3,7 +3,7 @@
 # Copyright (c) 2021 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPPNS
+if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 config BOARD
 	default "thingy53_nrf5340_cpuapp"
@@ -46,15 +46,15 @@ config SRAM_SIZE
 
 endif # BOARD_THINGY53_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE
 
-if BOARD_THINGY53_NRF5340_CPUAPPNS
+if BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 config FLASH_LOAD_OFFSET
 	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
 
 config FLASH_LOAD_SIZE
 	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
 
-endif # BOARD_THINGY53_NRF5340_CPUAPPNS
+endif # BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 if !TRUSTED_EXECUTION_SECURE
 
@@ -88,7 +88,7 @@ config REGULATOR
 
 endif # !TRUSTED_EXECUTION_SECURE
 
-endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPPNS
+endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 if BOARD_THINGY53_NRF5340_CPUNET
 

diff --git a/boards/arm/thingy53_nrf5340/board.cmake b/boards/arm/thingy53_nrf5340/board.cmake
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_BOARD_THINGY53_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY53_NRF5340_CPUAPPNS)
+if(CONFIG_BOARD_THINGY53_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY53_NRF5340_CPUAPP_NS)
 board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
 endif()
 

diff --git a/...y53_nrf5340/thingy53_nrf5340_cpuappns.dts → ...53_nrf5340/thingy53_nrf5340_cpuapp_ns.dts b/...y53_nrf5340/thingy53_nrf5340_cpuappns.dts → ...53_nrf5340/thingy53_nrf5340_cpuapp_ns.dts
diff --git a/...53_nrf5340/thingy53_nrf5340_cpuappns.yaml → ...3_nrf5340/thingy53_nrf5340_cpuapp_ns.yaml b/...53_nrf5340/thingy53_nrf5340_cpuappns.yaml → ...3_nrf5340/thingy53_nrf5340_cpuapp_ns.yaml
@@ -1,4 +1,4 @@
-identifier: thingy53_nrf5340_cpuappns
+identifier: thingy53_nrf5340_cpuapp_ns
 name: Thingy53-NRF5340-application-MCU-Non-Secure
 type: mcu
 arch: arm

diff --git a/...f5340/thingy53_nrf5340_cpuappns_defconfig → ...5340/thingy53_nrf5340_cpuapp_ns_defconfig b/...f5340/thingy53_nrf5340_cpuappns_defconfig → ...5340/thingy53_nrf5340_cpuapp_ns_defconfig
@@ -2,7 +2,7 @@
 
 CONFIG_SOC_SERIES_NRF53X=y
 CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
-CONFIG_BOARD_THINGY53_NRF5340_CPUAPPNS=y
+CONFIG_BOARD_THINGY53_NRF5340_CPUAPP_NS=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y

diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake
@@ -18,3 +18,4 @@ set(circuitdojo_feather_nrf9160ns_DEPRECATED circuitdojo_feather_nrf9160_ns)
 set(nrf9160_innblue21ns_DEPRECATED nrf9160_innblue21_ns)
 set(nrf9160_innblue22ns_DEPRECATED nrf9160_innblue22_ns)
 set(sparkfun_thing_plus_nrf9160ns_DEPRECATED sparkfun_thing_plus_nrf9160_ns)
+set(thingy53_nrf5340_cpuappns_DEPRECATED thingy53_nrf5340_cpuapp_ns)