boards: arm: nrf5340_audio_dk_nrf5340: Convert to v2

Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae
2024-02-02 11:38:15 +00:00
committed by Carles Cufi
parent 33ad2b5bc6
commit 28268c4938
27 changed files with 42 additions and 64 deletions

View File

@@ -1,18 +0,0 @@
# nRF5340 Audio DK board configuration
# Copyright (c) 2019 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
if SOC_NRF5340_CPUAPP_QKAA
config BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP
bool "nrf5340 Audio DK nRF5340 Application MCU"
config BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS
bool "nrf5340 Audio DK nRF5340 Application MCU non-secure"
endif # SOC_NRF5340_CPUAPP_QKAA
config BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET
bool "nrf5340 Audio DK NRF5340 Network MCU"
depends on SOC_NRF5340_CPUNET_QKAA

View File

@@ -1,15 +1,14 @@
# Copyright (c) 2021 Nordic Semiconductor ASA.
# SPDX-License-Identifier: Apache-2.0
if ((CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS)
if((CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS)
AND CONFIG_BOARD_ENABLE_CPUNET)
zephyr_library()
zephyr_library_sources(nrf5340_audio_dk_cpunet_reset.c)
if (CONFIG_BUILD_WITH_TFM)
if(CONFIG_BUILD_WITH_TFM)
zephyr_library_include_directories(
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()
endif()

View File

@@ -38,7 +38,7 @@ config BOARD_ENABLE_CPUNET
config DOMAIN_CPUNET_BOARD
string
default "nrf5340_audio_dk_nrf5340_cpunet"
default "nrf5340_audio_dk/nrf5340/cpunet"
depends on BOARD_ENABLE_CPUNET
help
The board which will be used for CPUNET domain when creating a multi
@@ -48,11 +48,14 @@ config DOMAIN_CPUNET_BOARD
endif # BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP || BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS
if BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET
config DOMAIN_CPUAPP_BOARD
string
default "nrf5340_audio_dk_nrf5340_cpuapp"
depends on BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET
default "nrf5340_audio_dk/nrf5340/cpuapp"
help
The board which will be used for CPUAPP domain when creating a multi
image application where one or more images should be located on
another board.
endif # BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET

View File

@@ -5,9 +5,6 @@
if BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP || BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS
config BOARD
default "nrf5340_audio_dk_nrf5340_cpuapp" if BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP || BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS
# Code Partition:
#
# For the secure version of the board the firmware is linked at the beginning
@@ -56,19 +53,6 @@ config FLASH_LOAD_SIZE
endif # BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS
endif # BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP || BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS
config BOARD
default "nrf5340_audio_dk_nrf5340_cpunet" if BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET
config IPM_NRFX
default IPM
config MBOX_NRFX_IPC
default MBOX
if BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP || BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS
choice BT_HCI_BUS_TYPE
default BT_HCI_IPC if BT
endchoice
@@ -79,6 +63,12 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
endif # BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP || BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS
config IPM_NRFX
default IPM
config MBOX_NRFX_IPC
default MBOX
if BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET
config BT_CTLR

View File

@@ -0,0 +1,9 @@
# nRF5340 Audio DK board configuration
# Copyright (c) 2019 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
config BOARD_NRF5340_AUDIO_DK
select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP
select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS
select SOC_NRF5340_CPUNET_QKAA if BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET

View File

@@ -6,9 +6,7 @@ endif()
if(CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS)
board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
endif()
if(CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET)
elseif(CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET)
board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
endif()

View File

@@ -0,0 +1,8 @@
board:
name: nrf5340_audio_dk
vendor: Nordic Semiconductor
socs:
- name: 'nrf5340'
variants:
- name: 'ns'
cpucluster: 'cpuapp'

View File

@@ -13,7 +13,7 @@ You can use this board for developing LE-Audio-compatible applications that supp
connected isochronous streams (CIS) and broadcast isochronous streams (BIS),
and offer support for acting as a audio source, audio sink and source + sink.
Zephyr uses the nrf5340_audio_dk_nrf5340 board configuration for building
Zephyr uses the ``nrf5340_audio_dk/nrf5340`` board configuration for building
for the nRF5340 Audio DK.
Hardware
@@ -49,8 +49,8 @@ The nRF5340 Audio DK is built around the nRF5340 SoC, which has the following ch
* A secondary Arm Cortex-M33 core, with a reduced feature set,
running at a fixed 64 MHz, referred to as the **network core**.
The nrf5340_audio_dk_nrf5340_cpuapp build target provides support for the application
core on the nRF5340 SoC. The nrf5340_audio_dk_nrf5340_cpunet build target provides
The ``nrf5340_audio_dk/nrf5340/cpuapp`` build target provides support for the application
core on the nRF5340 SoC. The ``nrf5340_audio_dk/nrf5340/cpunet`` build target provides
support for the network core on the nRF5340 SoC.
The `Nordic Semiconductor Infocenter`_ contains the processor's information and

View File

@@ -1,4 +1,4 @@
identifier: nrf5340_audio_dk_nrf5340_cpuapp
identifier: nrf5340_audio_dk/nrf5340/cpuapp
name: NRF5340-AUDIO-DK-NRF5340-application-MCU
type: mcu
arch: arm

View File

@@ -1,10 +1,6 @@
# Copyright (c) 2020 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP=y
CONFIG_ARM_MPU=y
CONFIG_HW_STACK_PROTECTION=y

View File

@@ -1,4 +1,4 @@
identifier: nrf5340_audio_dk_nrf5340_cpuapp_ns
identifier: nrf5340_audio_dk/nrf5340/cpuapp/ns
name: NRF5340-AUDIO-DK-NRF5340-application-MCU-Non-Secure
type: mcu
arch: arm

View File

@@ -1,10 +1,6 @@
# Copyright (c) 2020 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS=y
CONFIG_ARM_MPU=y
CONFIG_HW_STACK_PROTECTION=y

View File

@@ -1,4 +1,4 @@
identifier: nrf5340_audio_dk_nrf5340_cpunet
identifier: nrf5340_audio_dk/nrf5340/cpunet
name: NRF5340-AUDIO-DK-NRF5340-network-MCU
type: mcu
arch: arm

View File

@@ -1,21 +1,17 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUNET_QKAA=y
CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET=y
# Enable MPU
CONFIG_ARM_MPU=y
# Enable 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

View File

@@ -0,0 +1 @@
# SPDX-License-Identifier: Apache-2.0