diff --git a/boards/actinius/actinius_icarus/board.yml b/boards/actinius/actinius_icarus/board.yml index e5044ae5df1..03a01c0f59e 100644 --- a/boards/actinius/actinius_icarus/board.yml +++ b/boards/actinius/actinius_icarus/board.yml @@ -1,8 +1,10 @@ board: name: actinius_icarus vendor: Actinius - variants: - - name: 'ns' + socs: + - name: nrf9160 + variants: + - name: 'ns' revision: format: major.minor.patch default: "2.0.0" diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/Kconfig.board b/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/Kconfig.board deleted file mode 100644 index d69bc53f557..00000000000 --- a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/Kconfig.board +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/Kconfig b/boards/circuit_dojo/circuitdojo_feather/Kconfig.circuitdojo_feather similarity index 74% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/Kconfig rename to boards/circuit_dojo/circuitdojo_feather/Kconfig.circuitdojo_feather index 78e7bbd4530..74ef4bd8e27 100644 --- a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/Kconfig +++ b/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 diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/Kconfig.defconfig b/boards/circuit_dojo/circuitdojo_feather/Kconfig.defconfig similarity index 86% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/Kconfig.defconfig rename to boards/circuit_dojo/circuitdojo_feather/Kconfig.defconfig index 73648be3ef1..f093911dc47 100644 --- a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/Kconfig.defconfig +++ b/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 - -config BOARD - default "circuitdojo_feather_nrf9160" +if BOARD_CIRCUITDOJO_FEATHER # 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 diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/board.cmake b/boards/circuit_dojo/circuitdojo_feather/board.cmake similarity index 100% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/board.cmake rename to boards/circuit_dojo/circuitdojo_feather/board.cmake diff --git a/boards/circuit_dojo/circuitdojo_feather/board.yml b/boards/circuit_dojo/circuitdojo_feather/board.yml new file mode 100644 index 00000000000..1251787d937 --- /dev/null +++ b/boards/circuit_dojo/circuitdojo_feather/board.yml @@ -0,0 +1,7 @@ +board: + name: circuitdojo_feather + vendor: Circuit Dojo + socs: + - name: nrf9160 + variants: + - name: 'ns' diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160.dts b/boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160.dts similarity index 100% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160.dts rename to boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160.dts diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160.yaml b/boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160.yaml similarity index 81% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160.yaml rename to boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160.yaml index 05fd7a44189..ee93576b4af 100644 --- a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160.yaml +++ b/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 diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common-pinctrl.dtsi b/boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_common-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common-pinctrl.dtsi rename to boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_common-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common.dtsi b/boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_common.dtsi similarity index 100% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common.dtsi rename to boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_common.dtsi diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_defconfig b/boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_defconfig similarity index 58% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_defconfig rename to boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_defconfig index f3dc6d6155c..b5a9bfd1f88 100644 --- a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.dts b/boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_ns.dts similarity index 100% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.dts rename to boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_ns.dts diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.yaml b/boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_ns.yaml similarity index 80% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.yaml rename to boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_ns.yaml index 56905972e9f..582e28dbfc9 100644 --- a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.yaml +++ b/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 diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns_defconfig b/boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_ns_defconfig similarity index 65% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns_defconfig rename to boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_ns_defconfig index 9f25a5dda67..e87033d490d 100644 --- a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns_defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_partition_conf.dtsi b/boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_partition_conf.dtsi similarity index 100% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_partition_conf.dtsi rename to boards/circuit_dojo/circuitdojo_feather/circuitdojo_feather_nrf9160_partition_conf.dtsi diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/doc/img/circuitdojo_feather_nrf9160.jpg b/boards/circuit_dojo/circuitdojo_feather/doc/img/circuitdojo_feather_nrf9160.jpg similarity index 100% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/doc/img/circuitdojo_feather_nrf9160.jpg rename to boards/circuit_dojo/circuitdojo_feather/doc/img/circuitdojo_feather_nrf9160.jpg diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/doc/img/nrf9160-feather-v31-features.jpg b/boards/circuit_dojo/circuitdojo_feather/doc/img/nrf9160-feather-v31-features.jpg similarity index 100% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/doc/img/nrf9160-feather-v31-features.jpg rename to boards/circuit_dojo/circuitdojo_feather/doc/img/nrf9160-feather-v31-features.jpg diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/doc/index.rst b/boards/circuit_dojo/circuitdojo_feather/doc/index.rst similarity index 97% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/doc/index.rst rename to boards/circuit_dojo/circuitdojo_feather/doc/index.rst index f089c468e0d..46252ad090a 100644 --- a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/doc/index.rst +++ b/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 ********** diff --git a/boards/boards_legacy/arm/circuitdojo_feather_nrf9160/pre_dt_board.cmake b/boards/circuit_dojo/circuitdojo_feather/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/circuitdojo_feather_nrf9160/pre_dt_board.cmake rename to boards/circuit_dojo/circuitdojo_feather/pre_dt_board.cmake