boards: rename circuitdojo_feather_nrf9160ns

mbolivar-nordic · cfriedt · commit 5854bc3a48d8 · 2021-09-20T05:57:24.000-04:00
Change the 'ns' suffix to '_ns' for consistency with other boards.

Signed-off-by: Martí Bolívar &lt;marti.bolivar@nordicsemi.no&gt;
diff --git a/boards/arm/circuitdojo_feather_nrf9160/Kconfig.board b/boards/arm/circuitdojo_feather_nrf9160/Kconfig.board
@@ -9,7 +9,7 @@ if SOC_NRF9160_SICA
 config BOARD_CIRCUITDOJO_FEATHER_NRF9160
 	bool "Circuit Dojo nRF9160 Feather"
 
-config BOARD_CIRCUITDOJO_FEATHER_NRF9160NS
+config BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
 	bool "Circuit Dojo nRF9160 Feather non-secure"
 
 endif # SOC_NRF9160_SICA
diff --git a/boards/arm/circuitdojo_feather_nrf9160/Kconfig.defconfig b/boards/arm/circuitdojo_feather_nrf9160/Kconfig.defconfig
@@ -4,7 +4,7 @@
 # Copyright (c) 2020 Circuit Dojo LLC
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_CIRCUITDOJO_FEATHER_NRF9160 || BOARD_CIRCUITDOJO_FEATHER_NRF9160NS
+if BOARD_CIRCUITDOJO_FEATHER_NRF9160 || BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
 
 config BOARD
 	default "circuitdojo_feather_nrf9160"
@@ -26,14 +26,14 @@ config FLASH_LOAD_SIZE
 	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
 	depends on BOARD_CIRCUITDOJO_FEATHER_NRF9160 && TRUSTED_EXECUTION_SECURE
 
-if BOARD_CIRCUITDOJO_FEATHER_NRF9160NS
+if BOARD_CIRCUITDOJO_FEATHER_NRF9160_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_CIRCUITDOJO_FEATHER_NRF9160NS
+endif # BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
 
-endif # BOARD_CIRCUITDOJO_FEATHER_NRF9160 || BOARD_CIRCUITDOJO_FEATHER_NRF9160NS
+endif # BOARD_CIRCUITDOJO_FEATHER_NRF9160 || BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
diff --git a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.dts b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.dts
diff --git a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.yaml b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.yaml
@@ -1,4 +1,4 @@
-identifier: circuitdojo_feather_nrf9160ns
+identifier: circuitdojo_feather_nrf9160_ns
 name: CircuitDojo-Feather-nRF9160-Non-Secure
 type: mcu
 arch: arm
diff --git a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns_defconfig b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns_defconfig
@@ -2,7 +2,7 @@
 
 CONFIG_SOC_SERIES_NRF91X=y
 CONFIG_SOC_NRF9160_SICA=y
-CONFIG_BOARD_CIRCUITDOJO_FEATHER_NRF9160NS=y
+CONFIG_BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y
diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake
@@ -14,3 +14,4 @@ set(musca_b1_nonsecure_DEPRECATED musca_b1_ns)
 set(musca_s1_nonsecure_DEPRECATED musca_s1_ns)
 set(nrf5340dk_nrf5340_cpuappns_DEPRECATED nrf5340dk_nrf5340_cpuapp_ns)
 set(nrf9160dk_nrf9160ns_DEPRECATED nrf9160dk_nrf9160_ns)
+set(circuitdojo_feather_nrf9160ns_DEPRECATED circuitdojo_feather_nrf9160_ns)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-identifier: circuitdojo_feather_nrf9160ns`
	`1`	`+identifier: circuitdojo_feather_nrf9160_ns`
`2`	`2`	`name: CircuitDojo-Feather-nRF9160-Non-Secure`
`3`	`3`	`type: mcu`
`4`	`4`	`arch: arm`