From 2b0dbb9d51f53b340c049268b82e665acf5ecc2f Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 11:38:15 +0000 Subject: [PATCH] boards: arm: nrf9160_innblue21: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../arm/nrf9160_innblue21/Kconfig.board | 14 -------------- .../innblue21}/Kconfig.defconfig | 15 ++++++--------- boards/innblue/innblue21/Kconfig.innblue21 | 7 +++++++ .../innblue21}/board.cmake | 0 boards/innblue/innblue21/board.yml | 7 +++++++ .../innblue21}/doc/img/nrf9160_innblue21.jpg | Bin .../innblue21}/doc/index.rst | 12 ++++++------ .../innblue21/innblue21_common-pinctrl.dtsi} | 0 .../innblue21/innblue21_common.dtsi} | 4 ++-- .../innblue21/innblue21_nrf9160.dts} | 2 +- .../innblue21/innblue21_nrf9160.yaml} | 2 +- .../innblue21/innblue21_nrf9160_defconfig} | 11 +++-------- .../innblue21/innblue21_nrf9160_ns.dts} | 2 +- .../innblue21/innblue21_nrf9160_ns.yaml} | 2 +- .../innblue21/innblue21_nrf9160_ns_defconfig} | 11 +++-------- .../innblue21/innblue21_partition_conf.dtsi} | 0 .../innblue21}/pre_dt_board.cmake | 0 17 files changed, 38 insertions(+), 51 deletions(-) delete mode 100644 boards/boards_legacy/arm/nrf9160_innblue21/Kconfig.board rename boards/{boards_legacy/arm/nrf9160_innblue21 => innblue/innblue21}/Kconfig.defconfig (78%) create mode 100644 boards/innblue/innblue21/Kconfig.innblue21 rename boards/{boards_legacy/arm/nrf9160_innblue21 => innblue/innblue21}/board.cmake (100%) create mode 100644 boards/innblue/innblue21/board.yml rename boards/{boards_legacy/arm/nrf9160_innblue21 => innblue/innblue21}/doc/img/nrf9160_innblue21.jpg (100%) rename boards/{boards_legacy/arm/nrf9160_innblue21 => innblue/innblue21}/doc/index.rst (91%) rename boards/{boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_common-pinctrl.dtsi => innblue/innblue21/innblue21_common-pinctrl.dtsi} (100%) rename boards/{boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_common.dtsi => innblue/innblue21/innblue21_common.dtsi} (97%) rename boards/{boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21.dts => innblue/innblue21/innblue21_nrf9160.dts} (85%) rename boards/{boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21.yaml => innblue/innblue21/innblue21_nrf9160.yaml} (83%) rename boards/{boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_defconfig => innblue/innblue21/innblue21_nrf9160_defconfig} (58%) rename boards/{boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_ns.dts => innblue/innblue21/innblue21_nrf9160_ns.dts} (85%) rename boards/{boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_ns.yaml => innblue/innblue21/innblue21_nrf9160_ns.yaml} (83%) rename boards/{boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_ns_defconfig => innblue/innblue21/innblue21_nrf9160_ns_defconfig} (66%) rename boards/{boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_partition_conf.dtsi => innblue/innblue21/innblue21_partition_conf.dtsi} (100%) rename boards/{boards_legacy/arm/nrf9160_innblue21 => innblue/innblue21}/pre_dt_board.cmake (100%) diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/Kconfig.board b/boards/boards_legacy/arm/nrf9160_innblue21/Kconfig.board deleted file mode 100644 index af6b5478f9e..00000000000 --- a/boards/boards_legacy/arm/nrf9160_innblue21/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# nRF9160 innblue V2.1 board configuration - -# Copyright (c) 2020 InnBlue -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF9160_SICA - -config BOARD_NRF9160_INNBLUE21 - bool "nRF9160 innblue v2.1" - -config BOARD_NRF9160_INNBLUE21_NS - bool "nRF9160 innblue v2.1 non-secure" - -endif # SOC_NRF9160_SICA diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/Kconfig.defconfig b/boards/innblue/innblue21/Kconfig.defconfig similarity index 78% rename from boards/boards_legacy/arm/nrf9160_innblue21/Kconfig.defconfig rename to boards/innblue/innblue21/Kconfig.defconfig index 08d0409c9af..abf57a46a11 100644 --- a/boards/boards_legacy/arm/nrf9160_innblue21/Kconfig.defconfig +++ b/boards/innblue/innblue21/Kconfig.defconfig @@ -3,10 +3,7 @@ # Copyright (c) 2020 InnBlue # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF9160_INNBLUE21 || BOARD_NRF9160_INNBLUE21_NS - -config BOARD - default "nrf9160_innblue21" +if BOARD_INNBLUE21 # 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 @@ -22,14 +19,14 @@ config BOARD # Workaround for not being able to have commas in macro arguments DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition -if BOARD_NRF9160_INNBLUE21 && TRUSTED_EXECUTION_SECURE +if BOARD_INNBLUE21_NRF9160 && TRUSTED_EXECUTION_SECURE config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) -endif # BOARD_NRF9160_INNBLUE21 && TRUSTED_EXECUTION_SECURE +endif # BOARD_INNBLUE21_NRF9160 && TRUSTED_EXECUTION_SECURE -if BOARD_NRF9160_INNBLUE21_NS +if BOARD_INNBLUE21_NRF9160_NS config FLASH_LOAD_OFFSET default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) @@ -37,7 +34,7 @@ config FLASH_LOAD_OFFSET config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) -endif # BOARD_NRF9160_INNBLUE21_NS +endif # BOARD_INNBLUE21_NRF9160_NS config BT_HCI_VS default y if BT @@ -45,4 +42,4 @@ config BT_HCI_VS config REGULATOR default y if SENSOR -endif # BOARD_NRF9160_INNBLUE21 || BOARD_NRF9160_INNBLUE21_NS +endif # BOARD_INNBLUE21 diff --git a/boards/innblue/innblue21/Kconfig.innblue21 b/boards/innblue/innblue21/Kconfig.innblue21 new file mode 100644 index 00000000000..718e3753087 --- /dev/null +++ b/boards/innblue/innblue21/Kconfig.innblue21 @@ -0,0 +1,7 @@ +# nRF9160 innblue V2.1 board configuration + +# Copyright (c) 2020 InnBlue +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INNBLUE21 + select SOC_NRF9160_SICA diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/board.cmake b/boards/innblue/innblue21/board.cmake similarity index 100% rename from boards/boards_legacy/arm/nrf9160_innblue21/board.cmake rename to boards/innblue/innblue21/board.cmake diff --git a/boards/innblue/innblue21/board.yml b/boards/innblue/innblue21/board.yml new file mode 100644 index 00000000000..8d62be56790 --- /dev/null +++ b/boards/innblue/innblue21/board.yml @@ -0,0 +1,7 @@ +board: + name: innblue21 + vendor: innblue + socs: + - name: nrf9160 + variants: + - name: 'ns' diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/doc/img/nrf9160_innblue21.jpg b/boards/innblue/innblue21/doc/img/nrf9160_innblue21.jpg similarity index 100% rename from boards/boards_legacy/arm/nrf9160_innblue21/doc/img/nrf9160_innblue21.jpg rename to boards/innblue/innblue21/doc/img/nrf9160_innblue21.jpg diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/doc/index.rst b/boards/innblue/innblue21/doc/index.rst similarity index 91% rename from boards/boards_legacy/arm/nrf9160_innblue21/doc/index.rst rename to boards/innblue/innblue21/doc/index.rst index c0f9e33cd75..333db42bfd9 100644 --- a/boards/boards_legacy/arm/nrf9160_innblue21/doc/index.rst +++ b/boards/innblue/innblue21/doc/index.rst @@ -29,7 +29,7 @@ The following parts are built into the board: Supported Features ================== -The nrf9160_innblue21 board configuration supports the following +The innblue21 board configuration supports the following hardware (as of nRF9160) features: +-----------+------------+----------------------+ @@ -86,7 +86,7 @@ Security components Programming and Debugging ************************* -nrf9160_innblue21 supports the Armv8m Security Extension, and by default boots +innblue21 supports the Armv8m Security Extension, and by default boots in the Secure state. Building Secure/Non-Secure Zephyr applications @@ -94,9 +94,9 @@ Building Secure/Non-Secure Zephyr applications The process requires the following steps: -1. Build the Secure Zephyr application using ``-DBOARD=nrf9160_innblue21`` and +1. Build the Secure Zephyr application using ``-DBOARD=innblue21`` and ``CONFIG_TRUSTED_EXECUTION_SECURE=y`` in the application project configuration file. -2. Build the Non-Secure Zephyr application using ``-DBOARD=nrf9160_innblue21_ns``. +2. Build the Non-Secure Zephyr application using ``-DBOARD=innblue21/nrf9160/ns``. 3. Merge the two binaries together. When building a Secure/Non-Secure application, the Secure application will @@ -108,7 +108,7 @@ Building a Secure only application ================================== Build the Zephyr app in the usual way (see :ref:`build_an_application` -and :ref:`application_run`), using ``-DBOARD=nrf9160_innblue21``. +and :ref:`application_run`), using ``-DBOARD=innblue21``. Flashing ======== @@ -134,7 +134,7 @@ Then build and flash the application in the usual way. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: nrf9160_innblue21 + :board: innblue21 :goals: build flash Debugging diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_common-pinctrl.dtsi b/boards/innblue/innblue21/innblue21_common-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_common-pinctrl.dtsi rename to boards/innblue/innblue21/innblue21_common-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_common.dtsi b/boards/innblue/innblue21/innblue21_common.dtsi similarity index 97% rename from boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_common.dtsi rename to boards/innblue/innblue21/innblue21_common.dtsi index 0ec5de5dfb1..53160a680c6 100644 --- a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_common.dtsi +++ b/boards/innblue/innblue21/innblue21_common.dtsi @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "nrf9160_innblue21_common-pinctrl.dtsi" +#include "innblue21_common-pinctrl.dtsi" #include / { @@ -202,4 +202,4 @@ }; /* Include partition configuration file */ -#include "nrf9160_innblue21_partition_conf.dtsi" +#include "innblue21_partition_conf.dtsi" diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21.dts b/boards/innblue/innblue21/innblue21_nrf9160.dts similarity index 85% rename from boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21.dts rename to boards/innblue/innblue21/innblue21_nrf9160.dts index af9e3a2e784..f13c5c9036a 100644 --- a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21.dts +++ b/boards/innblue/innblue21/innblue21_nrf9160.dts @@ -6,7 +6,7 @@ /dts-v1/; #include -#include "nrf9160_innblue21_common.dtsi" +#include "innblue21_common.dtsi" / { chosen { diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21.yaml b/boards/innblue/innblue21/innblue21_nrf9160.yaml similarity index 83% rename from boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21.yaml rename to boards/innblue/innblue21/innblue21_nrf9160.yaml index 3c5100852c9..5722ebcd8c9 100644 --- a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21.yaml +++ b/boards/innblue/innblue21/innblue21_nrf9160.yaml @@ -1,4 +1,4 @@ -identifier: nrf9160_innblue21 +identifier: innblue21/nrf9160 name: nRF9160-INNBLUE21 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_defconfig b/boards/innblue/innblue21/innblue21_nrf9160_defconfig similarity index 58% rename from boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_defconfig rename to boards/innblue/innblue21/innblue21_nrf9160_defconfig index 7c0e84c1abd..75e6bba7131 100644 --- a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_defconfig +++ b/boards/innblue/innblue21/innblue21_nrf9160_defconfig @@ -1,23 +1,18 @@ # Copyright (c) 2020 InnBlue # SPDX-License-Identifier: Apache-2.0 -# SOC / Board -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_NRF9160_INNBLUE21=y - # Enable MPU CONFIG_ARM_MPU=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/nrf9160_innblue21/nrf9160_innblue21_ns.dts b/boards/innblue/innblue21/innblue21_nrf9160_ns.dts similarity index 85% rename from boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_ns.dts rename to boards/innblue/innblue21/innblue21_nrf9160_ns.dts index 8343318db22..2ca97a7b162 100644 --- a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_ns.dts +++ b/boards/innblue/innblue21/innblue21_nrf9160_ns.dts @@ -6,7 +6,7 @@ /dts-v1/; #include -#include "nrf9160_innblue21_common.dtsi" +#include "innblue21_common.dtsi" / { chosen { diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_ns.yaml b/boards/innblue/innblue21/innblue21_nrf9160_ns.yaml similarity index 83% rename from boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_ns.yaml rename to boards/innblue/innblue21/innblue21_nrf9160_ns.yaml index 4584ad0e6a4..17faee49190 100644 --- a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_ns.yaml +++ b/boards/innblue/innblue21/innblue21_nrf9160_ns.yaml @@ -1,4 +1,4 @@ -identifier: nrf9160_innblue21_ns +identifier: innblue21/nrf9160/ns name: nRF9160-INNBLUE21-Non-Secure type: mcu arch: arm diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_ns_defconfig b/boards/innblue/innblue21/innblue21_nrf9160_ns_defconfig similarity index 66% rename from boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_ns_defconfig rename to boards/innblue/innblue21/innblue21_nrf9160_ns_defconfig index 4f5410848bc..e27861efc3c 100644 --- a/boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_ns_defconfig +++ b/boards/innblue/innblue21/innblue21_nrf9160_ns_defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2020 InnBlue # SPDX-License-Identifier: Apache-2.0 -# SOC / Board -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_NRF9160_INNBLUE21_NS=y - # Enable MPU CONFIG_ARM_MPU=y @@ -15,12 +10,12 @@ CONFIG_ARM_TRUSTZONE_M=y # This Board implies building Non-Secure firmware CONFIG_TRUSTED_EXECUTION_NONSECURE=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/nrf9160_innblue21/nrf9160_innblue21_partition_conf.dtsi b/boards/innblue/innblue21/innblue21_partition_conf.dtsi similarity index 100% rename from boards/boards_legacy/arm/nrf9160_innblue21/nrf9160_innblue21_partition_conf.dtsi rename to boards/innblue/innblue21/innblue21_partition_conf.dtsi diff --git a/boards/boards_legacy/arm/nrf9160_innblue21/pre_dt_board.cmake b/boards/innblue/innblue21/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/nrf9160_innblue21/pre_dt_board.cmake rename to boards/innblue/innblue21/pre_dt_board.cmake