boards: arm: actinius_icarus_bee: Convert to v2
Converts the board to hwmv2 Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae
committed by
Carles Cufi
Carles Cufi
parent
30177cf53d
commit
db8c275456
@@ -3,6 +3,4 @@
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
zephyr_library()
|
||||
|
||||
add_subdirectory(${ZEPHYR_BASE}/boards/common/actinius actinius_common)
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -1,4 +1,4 @@
|
||||
identifier: actinius_icarus_bee
|
||||
identifier: actinius_icarus_bee/nrf9160
|
||||
name: Actinius Icarus Bee
|
||||
type: mcu
|
||||
arch: arm
|
||||
@@ -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
|
||||
@@ -0,0 +1,4 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# This board implies building Non-Secure firmware
|
||||
CONFIG_TRUSTED_EXECUTION_NONSECURE=y
|
||||
5
boards/actinius/actinius_icarus_bee/board.yml
Normal file
5
boards/actinius/actinius_icarus_bee/board.yml
Normal file
@@ -0,0 +1,5 @@
|
||||
board:
|
||||
name: actinius_icarus_bee
|
||||
vendor: Actinius
|
||||
variants:
|
||||
- name: 'ns'
|
||||
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
@@ -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
|
||||
@@ -1,5 +1,7 @@
|
||||
board:
|
||||
name: actinius_icarus_som
|
||||
vendor: Actinius
|
||||
socs:
|
||||
- name: nrf9160
|
||||
variants:
|
||||
- name: 'ns'
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user