From db8c2754565ac11c6e95c53b0d80e0024f24a006 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_bee: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../actinius_icarus_bee/CMakeLists.txt | 2 -- .../Kconfig.actinius_icarus_bee | 7 +++++ .../actinius_icarus_bee/Kconfig.defconfig | 13 ++++----- .../actinius_icarus_bee_common-pinctrl.dtsi | 0 .../actinius_icarus_bee_common.dtsi | 0 .../actinius_icarus_bee_defconfig | 10 ++----- .../actinius_icarus_bee_nrf9160.dts} | 0 .../actinius_icarus_bee_nrf9160.yaml} | 2 +- .../actinius_icarus_bee_nrf9160_ns.dts} | 0 .../actinius_icarus_bee_nrf9160_ns.yaml} | 2 +- .../actinius_icarus_bee_nrf9160_ns_defconfig | 4 +++ .../actinius_icarus_bee_partition_conf.dtsi | 0 .../actinius_icarus_bee/board.cmake | 0 boards/actinius/actinius_icarus_bee/board.yml | 5 ++++ .../doc/img/icarus-bee-external-pins.jpg | Bin .../doc/img/icarus-bee-peripherals-pins.jpg | Bin .../doc/img/icarus-bee.jpg | Bin .../actinius_icarus_bee/doc/index.rst | 2 +- .../dts/bindings/actinius-sim-select.yaml | 0 .../actinius_icarus_bee/pre_dt_board.cmake | 0 boards/actinius/actinius_icarus_som/board.yml | 6 ++-- .../arm/actinius_icarus_bee/Kconfig.board | 14 --------- .../actinius_icarus_bee_ns_defconfig | 27 ------------------ 23 files changed, 31 insertions(+), 63 deletions(-) rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/CMakeLists.txt (89%) create mode 100644 boards/actinius/actinius_icarus_bee/Kconfig.actinius_icarus_bee rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/Kconfig.defconfig (79%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/actinius_icarus_bee_common-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/actinius_icarus_bee_common.dtsi (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/actinius_icarus_bee_defconfig (64%) rename boards/{boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee.dts => actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160.dts} (100%) rename boards/{boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee.yaml => actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160.yaml} (83%) rename boards/{boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_ns.dts => actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns.dts} (100%) rename boards/{boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_ns.yaml => actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns.yaml} (83%) create mode 100644 boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns_defconfig rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/actinius_icarus_bee_partition_conf.dtsi (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/board.cmake (100%) create mode 100644 boards/actinius/actinius_icarus_bee/board.yml rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/doc/img/icarus-bee-external-pins.jpg (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.jpg (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/doc/img/icarus-bee.jpg (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/doc/index.rst (99%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/dts/bindings/actinius-sim-select.yaml (100%) rename boards/{boards_legacy/arm => actinius}/actinius_icarus_bee/pre_dt_board.cmake (100%) delete mode 100644 boards/boards_legacy/arm/actinius_icarus_bee/Kconfig.board delete mode 100644 boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_ns_defconfig diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/CMakeLists.txt b/boards/actinius/actinius_icarus_bee/CMakeLists.txt similarity index 89% rename from boards/boards_legacy/arm/actinius_icarus_bee/CMakeLists.txt rename to boards/actinius/actinius_icarus_bee/CMakeLists.txt index b54029984d1..7ddd62dbb2d 100644 --- a/boards/boards_legacy/arm/actinius_icarus_bee/CMakeLists.txt +++ b/boards/actinius/actinius_icarus_bee/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_bee/Kconfig.actinius_icarus_bee b/boards/actinius/actinius_icarus_bee/Kconfig.actinius_icarus_bee new file mode 100644 index 00000000000..6eb4e431f12 --- /dev/null +++ b/boards/actinius/actinius_icarus_bee/Kconfig.actinius_icarus_bee @@ -0,0 +1,7 @@ +# Actinius Icarus Bee board configuration + +# Copyright (c) 2021 Actinius +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACTINIUS_ICARUS_BEE + select SOC_NRF9160_SICA diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/Kconfig.defconfig b/boards/actinius/actinius_icarus_bee/Kconfig.defconfig similarity index 79% rename from boards/boards_legacy/arm/actinius_icarus_bee/Kconfig.defconfig rename to boards/actinius/actinius_icarus_bee/Kconfig.defconfig index 309a45a61d4..3eaf7f5f1c6 100644 --- a/boards/boards_legacy/arm/actinius_icarus_bee/Kconfig.defconfig +++ b/boards/actinius/actinius_icarus_bee/Kconfig.defconfig @@ -3,10 +3,7 @@ # Copyright (c) 2021 Actinius # SPDX-License-Identifier: Apache-2.0 -if BOARD_ACTINIUS_ICARUS_BEE || BOARD_ACTINIUS_ICARUS_BEE_NS - -config BOARD - default "actinius_icarus_bee" +if BOARD_ACTINIUS_ICARUS_BEE 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_BEE && TRUSTED_EXECUTION_SECURE + depends on BOARD_ACTINIUS_ICARUS_BEE_NRF9160 && TRUSTED_EXECUTION_SECURE -if BOARD_ACTINIUS_ICARUS_BEE_NS +if BOARD_ACTINIUS_ICARUS_BEE_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_BEE_NS +endif # BOARD_ACTINIUS_ICARUS_BEE_NRF9160_NS -endif # BOARD_ACTINIUS_ICARUS_BEE || BOARD_ACTINIUS_ICARUS_BEE_NS +endif # BOARD_ACTINIUS_ICARUS_BEE diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_common-pinctrl.dtsi b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_common-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_common-pinctrl.dtsi rename to boards/actinius/actinius_icarus_bee/actinius_icarus_bee_common-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_common.dtsi b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_common.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_common.dtsi rename to boards/actinius/actinius_icarus_bee/actinius_icarus_bee_common.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_defconfig b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_defconfig similarity index 64% rename from boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_defconfig rename to boards/actinius/actinius_icarus_bee/actinius_icarus_bee_defconfig index 64de49c899b..c486d832382 100644 --- a/boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_defconfig +++ b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_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_BEE=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_bee/actinius_icarus_bee.dts b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160.dts similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee.dts rename to boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160.dts diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee.yaml b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160.yaml similarity index 83% rename from boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee.yaml rename to boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160.yaml index 87052c0a149..8fd851899ba 100644 --- a/boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee.yaml +++ b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160.yaml @@ -1,4 +1,4 @@ -identifier: actinius_icarus_bee +identifier: actinius_icarus_bee/nrf9160 name: Actinius Icarus Bee type: mcu arch: arm diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_ns.dts b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns.dts similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_ns.dts rename to boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns.dts diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_ns.yaml b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns.yaml similarity index 83% rename from boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_ns.yaml rename to boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns.yaml index 6255c80c010..89b21ece170 100644 --- a/boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_ns.yaml +++ b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns.yaml @@ -1,4 +1,4 @@ -identifier: actinius_icarus_bee_ns +identifier: actinius_icarus_bee/nrf9160/ns name: Actinius Icarus Bee Non-Secure type: mcu arch: arm diff --git a/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns_defconfig b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns_defconfig new file mode 100644 index 00000000000..4baa62c55ef --- /dev/null +++ b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_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_bee/actinius_icarus_bee_partition_conf.dtsi b/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_partition_conf.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_partition_conf.dtsi rename to boards/actinius/actinius_icarus_bee/actinius_icarus_bee_partition_conf.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/board.cmake b/boards/actinius/actinius_icarus_bee/board.cmake similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_bee/board.cmake rename to boards/actinius/actinius_icarus_bee/board.cmake diff --git a/boards/actinius/actinius_icarus_bee/board.yml b/boards/actinius/actinius_icarus_bee/board.yml new file mode 100644 index 00000000000..5023e6f1e11 --- /dev/null +++ b/boards/actinius/actinius_icarus_bee/board.yml @@ -0,0 +1,5 @@ +board: + name: actinius_icarus_bee + vendor: Actinius + variants: + - name: 'ns' diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/doc/img/icarus-bee-external-pins.jpg b/boards/actinius/actinius_icarus_bee/doc/img/icarus-bee-external-pins.jpg similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_bee/doc/img/icarus-bee-external-pins.jpg rename to boards/actinius/actinius_icarus_bee/doc/img/icarus-bee-external-pins.jpg diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.jpg b/boards/actinius/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.jpg similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.jpg rename to boards/actinius/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.jpg diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/doc/img/icarus-bee.jpg b/boards/actinius/actinius_icarus_bee/doc/img/icarus-bee.jpg similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_bee/doc/img/icarus-bee.jpg rename to boards/actinius/actinius_icarus_bee/doc/img/icarus-bee.jpg diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/doc/index.rst b/boards/actinius/actinius_icarus_bee/doc/index.rst similarity index 99% rename from boards/boards_legacy/arm/actinius_icarus_bee/doc/index.rst rename to boards/actinius/actinius_icarus_bee/doc/index.rst index b6d166900aa..630d0aa07c7 100644 --- a/boards/boards_legacy/arm/actinius_icarus_bee/doc/index.rst +++ b/boards/actinius/actinius_icarus_bee/doc/index.rst @@ -108,7 +108,7 @@ Building Secure/Non-Secure Zephyr applications The process requires the following steps: 1. Build the Secure Zephyr application using ``-DBOARD=actinius_icarus_bee``. -2. Build the Non-Secure Zephyr application using ``-DBOARD=actinius_icarus_bee_ns``. +2. Build the Non-Secure Zephyr application using ``-DBOARD=actinius_icarus_bee/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_bee/dts/bindings/actinius-sim-select.yaml b/boards/actinius/actinius_icarus_bee/dts/bindings/actinius-sim-select.yaml similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_bee/dts/bindings/actinius-sim-select.yaml rename to boards/actinius/actinius_icarus_bee/dts/bindings/actinius-sim-select.yaml diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/pre_dt_board.cmake b/boards/actinius/actinius_icarus_bee/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_bee/pre_dt_board.cmake rename to boards/actinius/actinius_icarus_bee/pre_dt_board.cmake diff --git a/boards/actinius/actinius_icarus_som/board.yml b/boards/actinius/actinius_icarus_som/board.yml index 79ac78237a8..035f3345fad 100644 --- a/boards/actinius/actinius_icarus_som/board.yml +++ b/boards/actinius/actinius_icarus_som/board.yml @@ -1,5 +1,7 @@ board: name: actinius_icarus_som vendor: Actinius - variants: - - name: 'ns' + socs: + - name: nrf9160 + variants: + - name: 'ns' diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/Kconfig.board b/boards/boards_legacy/arm/actinius_icarus_bee/Kconfig.board deleted file mode 100644 index 39081152558..00000000000 --- a/boards/boards_legacy/arm/actinius_icarus_bee/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# Actinius Icarus Bee board configuration - -# Copyright (c) 2021 Actinius -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF9160_SICA - -config BOARD_ACTINIUS_ICARUS_BEE - bool "Actinius Icarus Bee" - -config BOARD_ACTINIUS_ICARUS_BEE_NS - bool "Actinius Icarus Bee Non-Secure" - -endif # SOC_NRF9160_SICA diff --git a/boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_ns_defconfig b/boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_ns_defconfig deleted file mode 100644 index 7e0d1c6e2df..00000000000 --- a/boards/boards_legacy/arm/actinius_icarus_bee/actinius_icarus_bee_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_BEE_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