boards: arm: actinius_icarus: Convert to v2

Converts the board to hwmv2

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

boards/actinius/actinius_icarus/CMakeLists.txt

@@ -3,6 +3,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_library()
-
 add_subdirectory(${ZEPHYR_BASE}/boards/common/actinius actinius_common)

boards/actinius/actinius_icarus/Kconfig.actinius_icarus

@@ -0,0 +1,7 @@
+# Actinius Icarus board configuration
+
+# Copyright (c) 2019 Actinius
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ACTINIUS_ICARUS
+	select SOC_NRF9160_SICA

boards/actinius/actinius_icarus/Kconfig.defconfig

@@ -3,10 +3,7 @@
 # Copyright (c) 2019 Actinius
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_ACTINIUS_ICARUS || BOARD_ACTINIUS_ICARUS_NS
-
-config BOARD
-	default "actinius_icarus"
+if BOARD_ACTINIUS_ICARUS
 
 source "boards/common/actinius/Kconfig"
 
@@ -25,9 +22,9 @@ DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
 
 config FLASH_LOAD_SIZE
 	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-	depends on BOARD_ACTINIUS_ICARUS && TRUSTED_EXECUTION_SECURE
+	depends on BOARD_ACTINIUS_ICARUS_NRF9160 && TRUSTED_EXECUTION_SECURE
 
-if BOARD_ACTINIUS_ICARUS_NS
+if BOARD_ACTINIUS_ICARUS_NRF9160_NS
 
 config FLASH_LOAD_OFFSET
 	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
@@ -35,6 +32,6 @@ config FLASH_LOAD_OFFSET
 config FLASH_LOAD_SIZE
 	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
 
-endif # BOARD_ACTINIUS_ICARUS_NS
+endif # BOARD_ACTINIUS_ICARUS_NRF9160_NS
 
-endif # BOARD_ACTINIUS_ICARUS || BOARD_ACTINIUS_ICARUS_NS
+endif # BOARD_ACTINIUS_ICARUS

boards/actinius/actinius_icarus/actinius_icarus_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF91X=y
-CONFIG_SOC_NRF9160_SICA=y
-CONFIG_BOARD_ACTINIUS_ICARUS=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
@@ -13,12 +9,12 @@ CONFIG_HW_STACK_PROTECTION=y
 # Enable TrustZone-M
 CONFIG_ARM_TRUSTZONE_M=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

boards/actinius/actinius_icarus/actinius_icarus_nrf9160.yaml

@@ -1,4 +1,4 @@
-identifier: actinius_icarus
+identifier: actinius_icarus/nrf9160
 name: Actinius Icarus
 type: mcu
 arch: arm

boards/actinius/actinius_icarus/actinius_icarus_nrf9160_1_4_0.overlay

@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
- #include "actinius_icarus_common_2_0_0.dtsi"
+#include "actinius_icarus_common_1_4_0.dtsi"

boards/actinius/actinius_icarus/actinius_icarus_nrf9160_2_0_0.overlay

@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
- #include "actinius_icarus_common_1_4_0.dtsi"
+#include "actinius_icarus_common_2_0_0.dtsi"

boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns.yaml

@@ -1,4 +1,4 @@
-identifier: actinius_icarus_ns
+identifier: actinius_icarus/nrf9160/ns
 name: Actinius Icarus Non-Secure
 type: mcu
 arch: arm

boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_1_4_0.overlay

@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
- #include "actinius_icarus_common_2_0_0.dtsi"
+#include "actinius_icarus_common_1_4_0.dtsi"

boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_2_0_0.overlay

@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
- #include "actinius_icarus_common_1_4_0.dtsi"
+#include "actinius_icarus_common_2_0_0.dtsi"

boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_defconfig

@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# This board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y

boards/actinius/actinius_icarus/board.yml

@@ -0,0 +1,11 @@
+board:
+  name: actinius_icarus
+  vendor: Actinius
+  variants:
+  - name: 'ns'
+  revision:
+    format: major.minor.patch
+    default: "2.0.0"
+    revisions:
+    - name: "1.4.0"
+    - name: "2.0.0"

boards/actinius/actinius_icarus/doc/index.rst

@@ -206,7 +206,7 @@ The process requires the following steps:
 
 1. Build the Secure Zephyr application using ``-DBOARD=actinius_icarus`` and
    ``CONFIG_TRUSTED_EXECUTION_SECURE=y`` in the application project configuration file.
-2. Build the Non-Secure Zephyr application using ``-DBOARD=actinius_icarus_ns``.
+2. Build the Non-Secure Zephyr application using ``-DBOARD=actinius_icarus/ns``.
 3. Merge the two binaries together.
 
 If you are using Segger Embedded Studio v4.18 or later, the two binaries are built, merged, and

boards/actinius/actinius_icarus_bee/board.yml

@@ -1,5 +1,7 @@
 board:
   name: actinius_icarus_bee
   vendor: Actinius
-  variants:
-  - name: 'ns'
+  socs:
+  - name: nrf9160
+    variants:
+    - name: 'ns'

boards/boards_legacy/arm/actinius_icarus/Kconfig.board

@@ -1,14 +0,0 @@
-# Actinius Icarus board configuration
-
-# Copyright (c) 2019 Actinius
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_NRF9160_SICA
-
-config BOARD_ACTINIUS_ICARUS
-	bool "Actinius Icarus"
-
-config BOARD_ACTINIUS_ICARUS_NS
-	bool "Actinius Icarus Non-Secure"
-
-endif # SOC_NRF9160_SICA

boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns_defconfig

@@ -1,27 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SOC_SERIES_NRF91X=y
-CONFIG_SOC_NRF9160_SICA=y
-CONFIG_BOARD_ACTINIUS_ICARUS_NS=y
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-# Enable TrustZone-M
-CONFIG_ARM_TRUSTZONE_M=y
-
-# This Board implies building Non-Secure firmware
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# Enable uart driver
-CONFIG_SERIAL=y
-
-# enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y

boards/boards_legacy/arm/actinius_icarus/revision.cmake

@@ -1,8 +0,0 @@
-# Copyright (c) 2022 Actinius
-# SPDX-License-Identifier: Apache-2.0
-
-board_check_revision(
-  FORMAT MAJOR.MINOR.PATCH
-  DEFAULT_REVISION 2.0.0
-  VALID_REVISIONS 1.4.0 2.0.0
-)