boards: arm: circuitdojo_feather_nrf9160: Convert to v2

Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boards/actinius/actinius_icarus/board.yml

@@ -1,8 +1,10 @@
 board:
   name: actinius_icarus
   vendor: Actinius
-  variants:
+  socs:
-  - name: 'ns'
+  - name: nrf9160
+    variants:
+    - name: 'ns'
   revision:
     format: major.minor.patch
     default: "2.0.0"

boards/boards_legacy/arm/circuitdojo_feather_nrf9160/Kconfig.board

@@ -1,15 +0,0 @@
-# Circuit Dojo nRF9160 Feather configuration
-
-# Copyright (c) 2018-2020 Nordic Semiconductor ASA
-# Copyright (c) 2020 Circuit Dojo LLC
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_NRF9160_SICA
-
-config BOARD_CIRCUITDOJO_FEATHER_NRF9160
-	bool "Circuit Dojo nRF9160 Feather"
-
-config BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
-	bool "Circuit Dojo nRF9160 Feather non-secure"
-
-endif # SOC_NRF9160_SICA

boards/circuit_dojo/circuitdojo_feather/Kconfig.circuitdojo_feather

@@ -3,3 +3,6 @@
 # Copyright (c) 2018-2020 Nordic Semiconductor ASA
 # Copyright (c) 2020 Circuit Dojo LLC
 # SPDX-License-Identifier: Apache-2.0
+
+config BOARD_CIRCUITDOJO_FEATHER
+	select SOC_NRF9160_SICA

boards/circuit_dojo/circuitdojo_feather/Kconfig.defconfig

@@ -4,10 +4,7 @@
 # Copyright (c) 2020 Circuit Dojo LLC
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_CIRCUITDOJO_FEATHER_NRF9160 || BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
+if BOARD_CIRCUITDOJO_FEATHER
-
-config BOARD
-	default "circuitdojo_feather_nrf9160"
 
 # For the secure version of the board the firmware is linked at the beginning
 # of the flash, or into the code-partition defined in DT if it is intended to
@@ -36,4 +33,4 @@ config FLASH_LOAD_SIZE
 
 endif # BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
 
-endif # BOARD_CIRCUITDOJO_FEATHER_NRF9160 || BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
+endif # BOARD_CIRCUITDOJO_FEATHER

boards/circuit_dojo/circuitdojo_feather/board.yml

@@ -0,0 +1,7 @@
+board:
+  name: circuitdojo_feather
+  vendor: Circuit Dojo
+  socs:
+  - name: nrf9160
+    variants:
+    - name: 'ns'

boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160.yaml

@@ -1,4 +1,4 @@
-identifier: circuitdojo_feather_nrf9160
+identifier: circuitdojo_feather/nrf9160
 name: CircuitDojo-Feather-nRF9160
 type: mcu
 arch: arm

boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF91X=y
-CONFIG_SOC_NRF9160_SICA=y
-CONFIG_BOARD_CIRCUITDOJO_FEATHER_NRF9160=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
@@ -13,15 +9,15 @@ CONFIG_ARM_TRUSTZONE_M=y
 # Hardware stack protection
 CONFIG_HW_STACK_PROTECTION=y
 
-# enable GPIO
+# Enable GPIO
 CONFIG_GPIO=y
 
-# Enable uart driver
+# Enable UART driver
 CONFIG_SERIAL=y
 
-# enable console
+# Enable console
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
-# required to enable 3V3 power rail
+# Required to enable 3V3 power rail
 CONFIG_REGULATOR=y

boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_ns.yaml

@@ -1,4 +1,4 @@
-identifier: circuitdojo_feather_nrf9160_ns
+identifier: circuitdojo_feather/nrf9160/ns
 name: CircuitDojo-Feather-nRF9160-Non-Secure
 type: mcu
 arch: arm

boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_ns_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF91X=y
-CONFIG_SOC_NRF9160_SICA=y
-CONFIG_BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
@@ -16,15 +12,15 @@ CONFIG_TRUSTED_EXECUTION_NONSECURE=y
 # Hardware stack protection
 CONFIG_HW_STACK_PROTECTION=y
 
-# enable GPIO
+# Enable GPIO
 CONFIG_GPIO=y
 
-# Enable uart driver
+# Enable UART driver
 CONFIG_SERIAL=y
 
-# enable console
+# Enable console
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
-# required to enable 3V3 power rail
+# Required to enable 3V3 power rail
 CONFIG_REGULATOR=y

boards/circuit_dojo/circuitdojo_feather/doc/index.rst

@@ -147,7 +147,7 @@ the board are working properly with Zephyr:
 
 You can build and flash the examples to make sure Zephyr is running correctly on
 your board. The button and LED definitions can be found in
-:zephyr_file:`boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common.dtsi`.
+:zephyr_file:`boards/circuit_dojo/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common.dtsi`.
 
 References
 **********