diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/CMakeLists.txt b/boards/actinius/actinius_icarus_som_dk/CMakeLists.txt similarity index 88% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/CMakeLists.txt rename to boards/actinius/actinius_icarus_som_dk/CMakeLists.txt index 1fff4c1e76c..4e57b25bdf1 100644 --- a/boards/boards_legacy/arm/actinius_icarus_som_dk/CMakeLists.txt +++ b/boards/actinius/actinius_icarus_som_dk/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_som_dk/Kconfig.actinius_icarus_som_dk b/boards/actinius/actinius_icarus_som_dk/Kconfig.actinius_icarus_som_dk new file mode 100644 index 00000000000..4c4966e9839 --- /dev/null +++ b/boards/actinius/actinius_icarus_som_dk/Kconfig.actinius_icarus_som_dk @@ -0,0 +1,7 @@ +# Actinius Icarus SoM DK board configuration + +# Copyright (c) 2022 Actinius +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACTINIUS_ICARUS_SOM_DK + select SOC_NRF9160_SICA diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/Kconfig.defconfig b/boards/actinius/actinius_icarus_som_dk/Kconfig.defconfig similarity index 78% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/Kconfig.defconfig rename to boards/actinius/actinius_icarus_som_dk/Kconfig.defconfig index 00024ae99ca..62e848d3468 100644 --- a/boards/boards_legacy/arm/actinius_icarus_som_dk/Kconfig.defconfig +++ b/boards/actinius/actinius_icarus_som_dk/Kconfig.defconfig @@ -3,10 +3,7 @@ # Copyright (c) 2022 Actinius # SPDX-License-Identifier: Apache-2.0 -if BOARD_ACTINIUS_ICARUS_SOM_DK || BOARD_ACTINIUS_ICARUS_SOM_DK_NS - -config BOARD - default "actinius_icarus_som_dk" +if BOARD_ACTINIUS_ICARUS_SOM_DK 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_SOM_DK && TRUSTED_EXECUTION_SECURE + depends on BOARD_ACTINIUS_ICARUS_SOM_DK_NRF9160 && TRUSTED_EXECUTION_SECURE -if BOARD_ACTINIUS_ICARUS_SOM_DK_NS +if BOARD_ACTINIUS_ICARUS_SOM_DK_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_SOM_DK_NS +endif # BOARD_ACTINIUS_ICARUS_SOM_DK_NRF9160_NS -endif # BOARD_ACTINIUS_ICARUS_SOM_DK || BOARD_ACTINIUS_ICARUS_SOM_DK_NS +endif # BOARD_ACTINIUS_ICARUS_SOM_DK diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_common-pinctrl.dtsi b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_common-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_common-pinctrl.dtsi rename to boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_common-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_common.dtsi b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_common.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_common.dtsi rename to boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_common.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_defconfig b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_defconfig similarity index 63% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_defconfig rename to boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_defconfig index 2542dbb901e..c486d832382 100644 --- a/boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_defconfig +++ b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_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_SOM_DK=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_som_dk/actinius_icarus_som_dk.dts b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160.dts similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk.dts rename to boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160.dts diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk.yaml b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160.yaml similarity index 86% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk.yaml rename to boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160.yaml index aea5ef27753..3b7d7377caa 100644 --- a/boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk.yaml +++ b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160.yaml @@ -1,4 +1,4 @@ -identifier: actinius_icarus_som_dk +identifier: actinius_icarus_som_dk/nrf9160 name: Actinius Icarus SoM DK type: mcu arch: arm diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_ns.dts b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.dts similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_ns.dts rename to boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.dts diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_ns.yaml b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.yaml similarity index 85% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_ns.yaml rename to boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.yaml index 2ecf72e7a57..b41972384ba 100644 --- a/boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_ns.yaml +++ b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.yaml @@ -1,4 +1,4 @@ -identifier: actinius_icarus_som_dk_ns +identifier: actinius_icarus_som_dk/nrf9160/ns name: Actinius Icarus SoM DK Non-Secure type: mcu arch: arm diff --git a/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns_defconfig b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns_defconfig new file mode 100644 index 00000000000..4baa62c55ef --- /dev/null +++ b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_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_som_dk/actinius_icarus_som_dk_partition_conf.dtsi b/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_partition_conf.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_partition_conf.dtsi rename to boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_partition_conf.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/arduino_connector.dtsi b/boards/actinius/actinius_icarus_som_dk/arduino_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/arduino_connector.dtsi rename to boards/actinius/actinius_icarus_som_dk/arduino_connector.dtsi diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/board.cmake b/boards/actinius/actinius_icarus_som_dk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/board.cmake rename to boards/actinius/actinius_icarus_som_dk/board.cmake diff --git a/boards/actinius/actinius_icarus_som_dk/board.yml b/boards/actinius/actinius_icarus_som_dk/board.yml new file mode 100644 index 00000000000..92b00cf7d73 --- /dev/null +++ b/boards/actinius/actinius_icarus_som_dk/board.yml @@ -0,0 +1,5 @@ +board: + name: actinius_icarus_som_dk + vendor: Actinius + variants: + - name: 'ns' diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/doc/img/icarus-som-dk-block-diagram.jpg b/boards/actinius/actinius_icarus_som_dk/doc/img/icarus-som-dk-block-diagram.jpg similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/doc/img/icarus-som-dk-block-diagram.jpg rename to boards/actinius/actinius_icarus_som_dk/doc/img/icarus-som-dk-block-diagram.jpg diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/doc/img/icarus-som-dk.jpg b/boards/actinius/actinius_icarus_som_dk/doc/img/icarus-som-dk.jpg similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/doc/img/icarus-som-dk.jpg rename to boards/actinius/actinius_icarus_som_dk/doc/img/icarus-som-dk.jpg diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/doc/index.rst b/boards/actinius/actinius_icarus_som_dk/doc/index.rst similarity index 99% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/doc/index.rst rename to boards/actinius/actinius_icarus_som_dk/doc/index.rst index 94cda9e5c02..c0d0a940339 100644 --- a/boards/boards_legacy/arm/actinius_icarus_som_dk/doc/index.rst +++ b/boards/actinius/actinius_icarus_som_dk/doc/index.rst @@ -210,7 +210,7 @@ Building Secure/Non-Secure Zephyr applications The process requires the following steps: 1. Build the Secure Zephyr application using ``-DBOARD=actinius_icarus_som_dk``. -2. Build the Non-Secure Zephyr application using ``-DBOARD=actinius_icarus_som_dk_ns``. +2. Build the Non-Secure Zephyr application using ``-DBOARD=actinius_icarus_som_dk/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_som_dk/dts/bindings/actinius-sim-select.yaml b/boards/actinius/actinius_icarus_som_dk/dts/bindings/actinius-sim-select.yaml similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/dts/bindings/actinius-sim-select.yaml rename to boards/actinius/actinius_icarus_som_dk/dts/bindings/actinius-sim-select.yaml diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/pre_dt_board.cmake b/boards/actinius/actinius_icarus_som_dk/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/actinius_icarus_som_dk/pre_dt_board.cmake rename to boards/actinius/actinius_icarus_som_dk/pre_dt_board.cmake diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/Kconfig.board b/boards/boards_legacy/arm/actinius_icarus_som_dk/Kconfig.board deleted file mode 100644 index d3d1bcacfd0..00000000000 --- a/boards/boards_legacy/arm/actinius_icarus_som_dk/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# Actinius Icarus SoM DK board configuration - -# Copyright (c) 2022 Actinius -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF9160_SICA - -config BOARD_ACTINIUS_ICARUS_SOM_DK - bool "Actinius Icarus SoM DK" - -config BOARD_ACTINIUS_ICARUS_SOM_DK_NS - bool "Actinius Icarus SoM DK Non-Secure" - -endif # SOC_NRF9160_SICA diff --git a/boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_ns_defconfig b/boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_ns_defconfig deleted file mode 100644 index 212dd785cd2..00000000000 --- a/boards/boards_legacy/arm/actinius_icarus_som_dk/actinius_icarus_som_dk_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_SOM_DK_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/seeed_studio/xiao_ble/board.yml b/boards/seeed_studio/xiao_ble/board.yml index 8792dd1c8f2..2c41801e102 100644 --- a/boards/seeed_studio/xiao_ble/board.yml +++ b/boards/seeed_studio/xiao_ble/board.yml @@ -1,5 +1,7 @@ board: name: xiao_ble vendor: Seeed Studio - variants: - - name: 'sense' + socs: + - name: nrf52840 + variants: + - name: 'sense'