From a5803ba099d7944c2588a0d8288ad00b705f4357 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 11:38:14 +0000 Subject: [PATCH] boards: arm: actinius_icarus: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../actinius_icarus/CMakeLists.txt | 2 -- .../actinius_icarus/Kconfig.actinius_icarus | 7 +++++ .../actinius_icarus/Kconfig.defconfig | 13 ++++----- .../actinius_icarus_common-pinctrl.dtsi | 0 .../actinius_icarus_common.dtsi | 0 .../actinius_icarus_common_1_4_0.dtsi | 0 .../actinius_icarus_common_2_0_0.dtsi | 0 .../actinius_icarus/actinius_icarus_defconfig | 10 ++----- .../actinius_icarus_nrf9160.dts} | 0 .../actinius_icarus_nrf9160.yaml} | 2 +- .../actinius_icarus_nrf9160_1_4_0.overlay} | 2 +- .../actinius_icarus_nrf9160_2_0_0.overlay} | 2 +- .../actinius_icarus_nrf9160_ns.dts} | 0 .../actinius_icarus_nrf9160_ns.yaml} | 2 +- .../actinius_icarus_nrf9160_ns_1_4_0.overlay} | 2 +- .../actinius_icarus_nrf9160_ns_2_0_0.overlay} | 2 +- .../actinius_icarus_nrf9160_ns_defconfig | 4 +++ .../actinius_icarus_partition_conf.dtsi | 0 .../actinius_icarus/board.cmake | 0 boards/actinius/actinius_icarus/board.yml | 11 +++++++ .../actinius_icarus/doc/img/Icarus_front.jpg | Bin .../doc/img/Icarus_pinouts.jpg | Bin .../actinius_icarus/doc/index.rst | 2 +- .../dts/bindings/actinius-charger-enable.yaml | 0 .../dts/bindings/actinius-sim-select.yaml | 0 .../actinius_icarus/feather_connector.dtsi | 0 .../actinius_icarus/pre_dt_board.cmake | 0 boards/actinius/actinius_icarus_bee/board.yml | 6 ++-- .../arm/actinius_icarus/Kconfig.board | 14 --------- .../actinius_icarus_ns_defconfig | 27 ------------------ .../arm/actinius_icarus/revision.cmake | 8 ------ 31 files changed, 41 insertions(+), 75 deletions(-) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/CMakeLists.txt (89%) create mode 100644 boards/actinius/actinius_icarus/Kconfig.actinius_icarus rename boards/{boards_legacy/arm => actinius}/actinius_icarus/Kconfig.defconfig (81%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/actinius_icarus_common-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/actinius_icarus_common.dtsi (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/actinius_icarus_common_1_4_0.dtsi (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/actinius_icarus_common_2_0_0.dtsi (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/actinius_icarus_defconfig (64%) rename boards/{boards_legacy/arm/actinius_icarus/actinius_icarus.dts => actinius/actinius_icarus/actinius_icarus_nrf9160.dts} (100%) rename boards/{boards_legacy/arm/actinius_icarus/actinius_icarus.yaml => actinius/actinius_icarus/actinius_icarus_nrf9160.yaml} (88%) rename boards/{boards_legacy/arm/actinius_icarus/actinius_icarus_ns_2_0_0.overlay => actinius/actinius_icarus/actinius_icarus_nrf9160_1_4_0.overlay} (63%) rename boards/{boards_legacy/arm/actinius_icarus/actinius_icarus_1_4_0.overlay => actinius/actinius_icarus/actinius_icarus_nrf9160_2_0_0.overlay} (63%) rename boards/{boards_legacy/arm/actinius_icarus/actinius_icarus_ns.dts => actinius/actinius_icarus/actinius_icarus_nrf9160_ns.dts} (100%) rename boards/{boards_legacy/arm/actinius_icarus/actinius_icarus_ns.yaml => actinius/actinius_icarus/actinius_icarus_nrf9160_ns.yaml} (88%) rename boards/{boards_legacy/arm/actinius_icarus/actinius_icarus_2_0_0.overlay => actinius/actinius_icarus/actinius_icarus_nrf9160_ns_1_4_0.overlay} (63%) rename boards/{boards_legacy/arm/actinius_icarus/actinius_icarus_ns_1_4_0.overlay => actinius/actinius_icarus/actinius_icarus_nrf9160_ns_2_0_0.overlay} (63%) create mode 100644 boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_defconfig rename boards/{boards_legacy/arm => actinius}/actinius_icarus/actinius_icarus_partition_conf.dtsi (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/board.cmake (100%) create mode 100644 boards/actinius/actinius_icarus/board.yml rename boards/{boards_legacy/arm => actinius}/actinius_icarus/doc/img/Icarus_front.jpg (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/doc/img/Icarus_pinouts.jpg (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/doc/index.rst (99%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/dts/bindings/actinius-charger-enable.yaml (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/dts/bindings/actinius-sim-select.yaml (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/feather_connector.dtsi (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus/pre_dt_board.cmake (100%) delete mode 100644 boards/boards_legacy/arm/actinius_icarus/Kconfig.board delete mode 100644 boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns_defconfig delete mode 100644 boards/boards_legacy/arm/actinius_icarus/revision.cmake diff --git a/boards/boards_legacy/arm/actinius_icarus/CMakeLists.txt b/boards/actinius/actinius_icarus/CMakeLists.txt similarity index 89% rename from boards/boards_legacy/arm/actinius_icarus/CMakeLists.txt rename to boards/actinius/actinius_icarus/CMakeLists.txt index a747a3fdffa..9a434a4d73d 100644 --- a/boards/boards_legacy/arm/actinius_icarus/CMakeLists.txt +++ b/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) diff --git a/boards/actinius/actinius_icarus/Kconfig.actinius_icarus b/boards/actinius/actinius_icarus/Kconfig.actinius_icarus new file mode 100644 index 00000000000..4c7d234bb63 --- /dev/null +++ b/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 diff --git a/boards/boards_legacy/arm/actinius_icarus/Kconfig.defconfig b/boards/actinius/actinius_icarus/Kconfig.defconfig similarity index 81% rename from boards/boards_legacy/arm/actinius_icarus/Kconfig.defconfig rename to boards/actinius/actinius_icarus/Kconfig.defconfig index 6994aac280d..80f8e6cab5d 100644 --- a/boards/boards_legacy/arm/actinius_icarus/Kconfig.defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_common-pinctrl.dtsi b/boards/actinius/actinius_icarus/actinius_icarus_common-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus_common-pinctrl.dtsi rename to boards/actinius/actinius_icarus/actinius_icarus_common-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_common.dtsi b/boards/actinius/actinius_icarus/actinius_icarus_common.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus_common.dtsi rename to boards/actinius/actinius_icarus/actinius_icarus_common.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_common_1_4_0.dtsi b/boards/actinius/actinius_icarus/actinius_icarus_common_1_4_0.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus_common_1_4_0.dtsi rename to boards/actinius/actinius_icarus/actinius_icarus_common_1_4_0.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_common_2_0_0.dtsi b/boards/actinius/actinius_icarus/actinius_icarus_common_2_0_0.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus_common_2_0_0.dtsi rename to boards/actinius/actinius_icarus/actinius_icarus_common_2_0_0.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_defconfig b/boards/actinius/actinius_icarus/actinius_icarus_defconfig similarity index 64% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus_defconfig rename to boards/actinius/actinius_icarus/actinius_icarus_defconfig index 58d15739a95..c486d832382 100644 --- a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus.dts b/boards/actinius/actinius_icarus/actinius_icarus_nrf9160.dts similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus.dts rename to boards/actinius/actinius_icarus/actinius_icarus_nrf9160.dts diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus.yaml b/boards/actinius/actinius_icarus/actinius_icarus_nrf9160.yaml similarity index 88% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus.yaml rename to boards/actinius/actinius_icarus/actinius_icarus_nrf9160.yaml index d547560af6f..2126208b0fd 100644 --- a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus.yaml +++ b/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 diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns_2_0_0.overlay b/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_1_4_0.overlay similarity index 63% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns_2_0_0.overlay rename to boards/actinius/actinius_icarus/actinius_icarus_nrf9160_1_4_0.overlay index 79e7c3ff28d..69d500b69fa 100644 --- a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns_2_0_0.overlay +++ b/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" diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_1_4_0.overlay b/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_2_0_0.overlay similarity index 63% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus_1_4_0.overlay rename to boards/actinius/actinius_icarus/actinius_icarus_nrf9160_2_0_0.overlay index 07190f7553f..68c064cb1b5 100644 --- a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_1_4_0.overlay +++ b/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" diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns.dts b/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns.dts similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns.dts rename to boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns.dts diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns.yaml b/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns.yaml similarity index 88% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns.yaml rename to boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns.yaml index 7fe1ea2ef47..f45b5d12e7c 100644 --- a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns.yaml +++ b/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 diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_2_0_0.overlay b/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_1_4_0.overlay similarity index 63% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus_2_0_0.overlay rename to boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_1_4_0.overlay index 79e7c3ff28d..69d500b69fa 100644 --- a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_2_0_0.overlay +++ b/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" diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns_1_4_0.overlay b/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_2_0_0.overlay similarity index 63% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns_1_4_0.overlay rename to boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_2_0_0.overlay index 07190f7553f..68c064cb1b5 100644 --- a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns_1_4_0.overlay +++ b/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" diff --git a/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_defconfig b/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_defconfig new file mode 100644 index 00000000000..4baa62c55ef --- /dev/null +++ b/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 diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_partition_conf.dtsi b/boards/actinius/actinius_icarus/actinius_icarus_partition_conf.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/actinius_icarus_partition_conf.dtsi rename to boards/actinius/actinius_icarus/actinius_icarus_partition_conf.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus/board.cmake b/boards/actinius/actinius_icarus/board.cmake similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/board.cmake rename to boards/actinius/actinius_icarus/board.cmake diff --git a/boards/actinius/actinius_icarus/board.yml b/boards/actinius/actinius_icarus/board.yml new file mode 100644 index 00000000000..e5044ae5df1 --- /dev/null +++ b/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" diff --git a/boards/boards_legacy/arm/actinius_icarus/doc/img/Icarus_front.jpg b/boards/actinius/actinius_icarus/doc/img/Icarus_front.jpg similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/doc/img/Icarus_front.jpg rename to boards/actinius/actinius_icarus/doc/img/Icarus_front.jpg diff --git a/boards/boards_legacy/arm/actinius_icarus/doc/img/Icarus_pinouts.jpg b/boards/actinius/actinius_icarus/doc/img/Icarus_pinouts.jpg similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/doc/img/Icarus_pinouts.jpg rename to boards/actinius/actinius_icarus/doc/img/Icarus_pinouts.jpg diff --git a/boards/boards_legacy/arm/actinius_icarus/doc/index.rst b/boards/actinius/actinius_icarus/doc/index.rst similarity index 99% rename from boards/boards_legacy/arm/actinius_icarus/doc/index.rst rename to boards/actinius/actinius_icarus/doc/index.rst index 7f040e6630e..8092c53c8c9 100644 --- a/boards/boards_legacy/arm/actinius_icarus/doc/index.rst +++ b/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 diff --git a/boards/boards_legacy/arm/actinius_icarus/dts/bindings/actinius-charger-enable.yaml b/boards/actinius/actinius_icarus/dts/bindings/actinius-charger-enable.yaml similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/dts/bindings/actinius-charger-enable.yaml rename to boards/actinius/actinius_icarus/dts/bindings/actinius-charger-enable.yaml diff --git a/boards/boards_legacy/arm/actinius_icarus/dts/bindings/actinius-sim-select.yaml b/boards/actinius/actinius_icarus/dts/bindings/actinius-sim-select.yaml similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/dts/bindings/actinius-sim-select.yaml rename to boards/actinius/actinius_icarus/dts/bindings/actinius-sim-select.yaml diff --git a/boards/boards_legacy/arm/actinius_icarus/feather_connector.dtsi b/boards/actinius/actinius_icarus/feather_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/feather_connector.dtsi rename to boards/actinius/actinius_icarus/feather_connector.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus/pre_dt_board.cmake b/boards/actinius/actinius_icarus/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus/pre_dt_board.cmake rename to boards/actinius/actinius_icarus/pre_dt_board.cmake diff --git a/boards/actinius/actinius_icarus_bee/board.yml b/boards/actinius/actinius_icarus_bee/board.yml index 5023e6f1e11..c5dbd52395d 100644 --- a/boards/actinius/actinius_icarus_bee/board.yml +++ b/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' diff --git a/boards/boards_legacy/arm/actinius_icarus/Kconfig.board b/boards/boards_legacy/arm/actinius_icarus/Kconfig.board deleted file mode 100644 index bdf4d8e2c36..00000000000 --- a/boards/boards_legacy/arm/actinius_icarus/Kconfig.board +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns_defconfig b/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns_defconfig deleted file mode 100644 index e2e6e11584b..00000000000 --- a/boards/boards_legacy/arm/actinius_icarus/actinius_icarus_ns_defconfig +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/actinius_icarus/revision.cmake b/boards/boards_legacy/arm/actinius_icarus/revision.cmake deleted file mode 100644 index d63947b74bf..00000000000 --- a/boards/boards_legacy/arm/actinius_icarus/revision.cmake +++ /dev/null @@ -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 -)