boards: arm: pan1783: 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-14 14:05:04 +00:00
committed by Carles Cufi
parent 91a077b2ab
commit c1b77b223d
41 changed files with 160 additions and 183 deletions

View File

@@ -1,7 +0,0 @@
# Copyright (c) 2023 Panasonic Industrial Devices Europe GmbH
# SPDX-License-Identifier: Apache-2.0
if((CONFIG_BOARD_PAN1783_EVB_CPUAPP OR CONFIG_BOARD_PAN1783A_EVB_CPUAPP OR CONFIG_BOARD_PAN1783A_PA_EVB_CPUAPP) AND (CONFIG_BOARD_ENABLE_CPUNET))
zephyr_library()
zephyr_library_sources(pan1783_cpunet_reset.c)
endif()

View File

@@ -1,28 +0,0 @@
# PAN1783 EVB board configuration
# Copyright (c) 2023 Panasonic Industrial Devices Europe GmbH
# SPDX-License-Identifier: Apache-2.0
config BOARD_PAN1783_EVB_CPUAPP
bool "PAN1783 EVB (nRF5340) Application MCU"
depends on SOC_NRF5340_CPUAPP_QKAA
config BOARD_PAN1783A_EVB_CPUAPP
bool "PAN1783A EVB (nRF5340) Application MCU"
depends on SOC_NRF5340_CPUAPP_QKAA
config BOARD_PAN1783A_PA_EVB_CPUAPP
bool "PAN1783A-PA EVB (nRF5340) Application MCU"
depends on SOC_NRF5340_CPUAPP_QKAA
config BOARD_PAN1783_EVB_CPUNET
bool "PAN1783 EVB (NRF5340) Network MCU"
depends on SOC_NRF5340_CPUNET_QKAA
config BOARD_PAN1783A_EVB_CPUNET
bool "PAN1783A EVB (NRF5340) Network MCU"
depends on SOC_NRF5340_CPUNET_QKAA
config BOARD_PAN1783A_PA_EVB_CPUNET
bool "PAN1783A-PA EVB (NRF5340) Network MCU"
depends on SOC_NRF5340_CPUNET_QKAA

View File

@@ -1,34 +0,0 @@
# PAN1783 EVB board configuration
# Copyright (c) 2023 Panasonic Industrial Devices Europe GmbH
# SPDX-License-Identifier: Apache-2.0
config BOARD
default "pan1783_evb_cpuapp" if BOARD_PAN1783_EVB_CPUAPP
default "pan1783a_evb_cpuapp" if BOARD_PAN1783A_EVB_CPUAPP
default "pan1783a_pa_evb_cpuapp" if BOARD_PAN1783A_PA_EVB_CPUAPP
default "pan1783_evb_cpunet" if BOARD_PAN1783_EVB_CPUNET
default "pan1783a_evb_cpunet" if BOARD_PAN1783A_EVB_CPUNET
default "pan1783a_pa_evb_cpunet" if BOARD_PAN1783A_PA_EVB_CPUNET
config MBOX_NRFX_IPC
default MBOX
if BOARD_PAN1783_EVB_CPUAPP || BOARD_PAN1783A_EVB_CPUAPP || BOARD_PAN1783A_PA_EVB_CPUAPP
choice BT_HCI_BUS_TYPE
default BT_HCI_IPC if BT
endchoice
config HEAP_MEM_POOL_ADD_SIZE_BOARD
int
default 4096 if BT_HCI_IPC
endif # BOARD_PAN1783_EVB_CPUAPP || BOARD_PAN1783A_EVB_CPUAPP || BOARD_PAN1783A_PA_EVB_CPUAPP
if BOARD_PAN1783_EVB_CPUNET || BOARD_PAN1783A_EVB_CPUNET || BOARD_PAN1783A_PA_EVB_CPUNET
config BT_CTLR
default y if BT
endif # BOARD_PAN1783_EVB_CPUNET || BOARD_PAN1783A_EVB_CPUNET || BOARD_PAN1783A_PA_EVB_CPUNET

View File

@@ -1,25 +0,0 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
CONFIG_BOARD_PAN1783A_EVB_CPUAPP=y
# Enable MPU
CONFIG_ARM_MPU=y
# Enable hardware stack protection
CONFIG_HW_STACK_PROTECTION=y
# enable GPIO
CONFIG_GPIO=y
# Enable uart driver
CONFIG_SERIAL=y
# enable console
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
# clock config
CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=n

View File

@@ -1,25 +0,0 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
CONFIG_BOARD_PAN1783A_PA_EVB_CPUAPP=y
# Enable MPU
CONFIG_ARM_MPU=y
# Enable hardware stack protection
CONFIG_HW_STACK_PROTECTION=y
# enable GPIO
CONFIG_GPIO=y
# Enable uart driver
CONFIG_SERIAL=y
# enable console
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
# clock config
CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=n

View File

@@ -0,0 +1,7 @@
# Copyright (c) 2023 Panasonic Industrial Devices Europe GmbH
# SPDX-License-Identifier: Apache-2.0
if(CONFIG_SOC_NRF5340_CPUAPP_QKAA AND CONFIG_BOARD_ENABLE_CPUNET)
zephyr_library()
zephyr_library_sources(pan1783_nrf5340_cpunet_reset.c)
endif()

View File

@@ -3,7 +3,7 @@
# Copyright (c) 2023 Panasonic Industrial Devices Europe GmbH
# SPDX-License-Identifier: Apache-2.0
if BOARD_PAN1783_EVB_CPUAPP || BOARD_PAN1783A_EVB_CPUAPP || BOARD_PAN1783A_PA_EVB_CPUAPP
if SOC_NRF5340_CPUAPP_QKAA
config BOARD_ENABLE_DCDC_APP
bool "Application MCU DCDC converter"
@@ -33,9 +33,9 @@ config BOARD_ENABLE_CPUNET
config DOMAIN_CPUNET_BOARD
string
default "pan1783_evb_cpunet" if BOARD_PAN1783_EVB_CPUAPP
default "pan1783a_evb_cpunet" if BOARD_PAN1783A_EVB_CPUAPP
default "pan1783a_pa_evb_cpunet" if BOARD_PAN1783A_PA_EVB_CPUAPP
default "pan1783_evb/nrf5340/cpunet" if BOARD_PAN1783_EVB_NRF5340_CPUAPP
default "pan1783a_evb/nrf5340/cpunet" if BOARD_PAN1783A_EVB_NRF5340_CPUAPP
default "pan1783a_pa_evb/nrf5340/cpunet" if BOARD_PAN1783A_PA_EVB_NRF5340_CPUAPP
depends on BOARD_ENABLE_CPUNET
help
The board which will be used for CPUNET domain when creating a multi
@@ -43,13 +43,13 @@ config DOMAIN_CPUNET_BOARD
another board. For example hci_ipc on the nRF5340_cpunet for
Bluetooth applications.
endif # BOARD_PAN1783_EVB_CPUAPP || BOARD_PAN1783A_EVB_CPUAPP || BOARD_PAN1783A_PA_EVB_CPUAPP
endif # SOC_NRF5340_CPUAPP_QKAA
config DOMAIN_CPUAPP_BOARD
string
default "pan1783_evb_cpuapp" if BOARD_PAN1783_EVB_CPUNET
default "pan1783a_evb_cpuapp" if BOARD_PAN1783A_EVB_CPUNET
default "pan1783a_pa_evb_cpuapp" if BOARD_PAN1783A_PA_EVB_CPUNET
default "pan1783_evb/nrf5340/cpuapp" if BOARD_PAN1783_EVB_NRF5340_CPUNET
default "pan1783a_evb/nrf5340/cpuapp" if BOARD_PAN1783A_EVB_NRF5340_CPUNET
default "pan1783a_pa_evb/nrf5340/cpuapp" if BOARD_PAN1783A_PA_EVB_NRF5340_CPUNET
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

View File

@@ -0,0 +1,26 @@
# PAN1783 EVB board configuration
# Copyright (c) 2023 Panasonic Industrial Devices Europe GmbH
# SPDX-License-Identifier: Apache-2.0
config MBOX_NRFX_IPC
default MBOX
if SOC_NRF5340_CPUAPP_QKAA
choice BT_HCI_BUS_TYPE
default BT_HCI_IPC if BT
endchoice
config HEAP_MEM_POOL_ADD_SIZE_BOARD
int
default 4096 if BT_HCI_IPC
endif # SOC_NRF5340_CPUAPP_QKAA
if SOC_NRF5340_CPUNET_QKAA
config BT_CTLR
default y if BT
endif # SOC_NRF5340_CPUNET_QKAA

View File

@@ -0,0 +1,8 @@
# PAN1783 EVB board configuration
# Copyright (c) 2023 Panasonic Industrial Devices Europe GmbH
# SPDX-License-Identifier: Apache-2.0
config BOARD_PAN1783_EVB
select SOC_NRF5340_CPUAPP_QKAA if BOARD_PAN1783_EVB_NRF5340_CPUAPP
select SOC_NRF5340_CPUNET_QKAA if BOARD_PAN1783_EVB_NRF5340_CPUNET

View File

@@ -0,0 +1,8 @@
# PAN1783 EVB board configuration
# Copyright (c) 2023 Panasonic Industrial Devices Europe GmbH
# SPDX-License-Identifier: Apache-2.0
config BOARD_PAN1783A_EVB
select SOC_NRF5340_CPUAPP_QKAA if BOARD_PAN1783A_EVB_NRF5340_CPUAPP
select SOC_NRF5340_CPUNET_QKAA if BOARD_PAN1783A_EVB_NRF5340_CPUNET

View File

@@ -0,0 +1,8 @@
# PAN1783 EVB board configuration
# Copyright (c) 2023 Panasonic Industrial Devices Europe GmbH
# SPDX-License-Identifier: Apache-2.0
config BOARD_PAN1783A_PA_EVB
select SOC_NRF5340_CPUAPP_QKAA if BOARD_PAN1783A_PA_EVB_NRF5340_CPUAPP
select SOC_NRF5340_CPUNET_QKAA if BOARD_PAN1783A_PA_EVB_NRF5340_CPUNET

View File

@@ -1,10 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
if(CONFIG_BOARD_PAN1783_EVB_CPUAPP OR CONFIG_BOARD_PAN1783A_EVB_CPUAPP OR CONFIG_BOARD_PAN1783A_PA_EVB_CPUAPP)
if(CONFIG_SOC_NRF5340_CPUAPP_QKAA)
board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
endif()
if(CONFIG_BOARD_PAN1783_EVB_CPUNET OR CONFIG_BOARD_PAN1783A_EVB_CPUNET OR CONFIG_BOARD_PAN1783A_PA_EVB_CPUNET)
if(CONFIG_SOC_NRF5340_CPUNET_QKAA)
board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
endif()

View File

@@ -0,0 +1,13 @@
boards:
- name: pan1783_evb
vendor: Panasonic Industrial Devices Europe GmbH
socs:
- name: nrf5340
- name: pan1783a_evb
vendor: Panasonic Industrial Devices Europe GmbH
socs:
- name: nrf5340
- name: pan1783a_pa_evb
vendor: Panasonic Industrial Devices Europe GmbH
socs:
- name: nrf5340

View File

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View File

@@ -6,7 +6,7 @@
/dts-v1/;
#include <nordic/nrf5340_cpuapp_qkaa.dtsi>
#include "pan1783_cpuapp_common.dtsi"
#include "pan1783_nrf5340_cpuapp_common.dtsi"
/ {
model = "Panasonic PAN1783 EVB (NRF5340) Application";

View File

@@ -1,4 +1,4 @@
identifier: pan1783_evb_cpuapp
identifier: pan1783_evb/nrf5340/cpuapp
name: PAN1783-EVB-application-MCU
type: mcu
arch: arm

View File

@@ -1,18 +1,21 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUNET_QKAA=y
CONFIG_BOARD_PAN1783_EVB_CPUNET=y
# Enable MPU
CONFIG_ARM_MPU=y
# Enable hardware stack protection
CONFIG_HW_STACK_PROTECTION=y
# enable GPIO
# Enable GPIO
CONFIG_GPIO=y
# clock config
# Enable UART driver
CONFIG_SERIAL=y
# Enable console
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
# Clock config
CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=n

View File

@@ -6,7 +6,7 @@
/dts-v1/;
#include <nordic/nrf5340_cpunet_qkaa.dtsi>
#include "pan1783_cpunet_common.dtsi"
#include "pan1783_nrf5340_cpunet_common.dtsi"
/ {
model = "Panasonic PAN1783 EVB (NRF5340) Network";
@@ -20,4 +20,4 @@
};
/* Include shared RAM configuration file */
#include "pan1783_shared_sram_planning_conf.dtsi"
#include "pan1783_nrf5340_shared_sram_planning_conf.dtsi"

View File

@@ -1,4 +1,4 @@
identifier: pan1783_evb_cpunet
identifier: pan1783_evb/nrf5340/cpunet
name: PAN1783-EVB-network-MCU
type: mcu
arch: arm

View File

@@ -1,25 +1,14 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
CONFIG_BOARD_PAN1783_EVB_CPUAPP=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
CONFIG_SERIAL=y
# enable console
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
# clock config
# Clock config
CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=n

View File

@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "pan1783_cpuapp_common-pinctrl.dtsi"
#include "pan1783_nrf5340_cpuapp_common-pinctrl.dtsi"
#include <zephyr/dt-bindings/input/input-event-codes.h>
/ {
@@ -297,4 +297,4 @@ zephyr_udc0: &usbd {
};
/* Include partition configuration file */
#include "pan1783_cpuapp_partition_conf.dtsi"
#include "pan1783_nrf5340_cpuapp_partition_conf.dtsi"

View File

@@ -35,4 +35,4 @@
};
/* Include shared RAM configuration file */
#include "pan1783_shared_sram_planning_conf.dtsi"
#include "pan1783_nrf5340_shared_sram_planning_conf.dtsi"

View File

@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "pan1783_cpunet-pinctrl.dtsi"
#include "pan1783_nrf5340_cpunet-pinctrl.dtsi"
#include <zephyr/dt-bindings/input/input-event-codes.h>
/ {
@@ -204,4 +204,4 @@ arduino_spi: &spi0 {
};
/* Include shared RAM configuration file */
#include "pan1783_shared_sram_planning_conf.dtsi"
#include "pan1783_nrf5340_shared_sram_planning_conf.dtsi"

View File

@@ -11,11 +11,11 @@
#include <soc.h>
#include <hal/nrf_reset.h>
#if defined(CONFIG_BOARD_PAN1783_EVB_CPUAPP)
#if defined(CONFIG_BOARD_PAN1783_EVB_NRF5340_CPUAPP)
LOG_MODULE_REGISTER(pan1783_evb_cpuapp, CONFIG_LOG_DEFAULT_LEVEL);
#elif defined(CONFIG_BOARD_PAN1783A_EVB_CPUAPP)
#elif defined(CONFIG_BOARD_PAN1783A_EVB_NRF5340_CPUAPP)
LOG_MODULE_REGISTER(pan1783a_evb_cpuapp, CONFIG_LOG_DEFAULT_LEVEL);
#elif defined(CONFIG_BOARD_PAN1783A_PA_EVB_CPUAPP)
#elif defined(CONFIG_BOARD_PAN1783A_PA_EVB_NRF5340_CPUAPP)
LOG_MODULE_REGISTER(pan1783a_pa_evb_cpuapp, CONFIG_LOG_DEFAULT_LEVEL);
#else
#error "No board selected!"

View File

@@ -6,7 +6,7 @@
/dts-v1/;
#include <nordic/nrf5340_cpuapp_qkaa.dtsi>
#include "pan1783_cpuapp_common.dtsi"
#include "pan1783_nrf5340_cpuapp_common.dtsi"
/ {
model = "Panasonic PAN1783A EVB (NRF5340) Application";

View File

@@ -1,4 +1,4 @@
identifier: pan1783a_evb_cpuapp
identifier: pan1783a_evb/nrf5340/cpuapp
name: PAN1783A-EVB-application-MCU
type: mcu
arch: arm

View File

@@ -1,18 +1,21 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUNET_QKAA=y
CONFIG_BOARD_PAN1783A_EVB_CPUNET=y
# Enable MPU
CONFIG_ARM_MPU=y
# Enable hardware stack protection
CONFIG_HW_STACK_PROTECTION=y
# enable GPIO
# Enable GPIO
CONFIG_GPIO=y
# clock config
# Enable UART driver
CONFIG_SERIAL=y
# Enable console
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
# Clock config
CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=n

View File

@@ -6,7 +6,7 @@
/dts-v1/;
#include <nordic/nrf5340_cpunet_qkaa.dtsi>
#include "pan1783_cpunet_common.dtsi"
#include "pan1783_nrf5340_cpunet_common.dtsi"
/ {
model = "Panasonic PAN1783A EVB (NRF5340) Network";
@@ -20,4 +20,4 @@
};
/* Include shared RAM configuration file */
#include "pan1783_shared_sram_planning_conf.dtsi"
#include "pan1783_nrf5340_shared_sram_planning_conf.dtsi"

View File

@@ -1,4 +1,4 @@
identifier: pan1783a_evb_cpunet
identifier: pan1783a_evb/nrf5340/cpunet
name: PAN1783A-EVB-network-MCU
type: mcu
arch: arm

View File

@@ -0,0 +1,14 @@
# SPDX-License-Identifier: Apache-2.0
# Enable MPU
CONFIG_ARM_MPU=y
# Enable hardware stack protection
CONFIG_HW_STACK_PROTECTION=y
# Enable GPIO
CONFIG_GPIO=y
# Clock config
CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=n

View File

@@ -6,7 +6,7 @@
/dts-v1/;
#include <nordic/nrf5340_cpuapp_qkaa.dtsi>
#include "pan1783_cpuapp_common.dtsi"
#include "pan1783_nrf5340_cpuapp_common.dtsi"
/ {
model = "Panasonic PAN1783A-PA EVB (NRF5340) Application";

View File

@@ -1,4 +1,4 @@
identifier: pan1783a_pa_evb_cpuapp
identifier: pan1783a_pa_evb/nrf5340/cpuapp
name: PAN1783A-PA-EVB-application-MCU
type: mcu
arch: arm

View File

@@ -1,18 +1,21 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUNET_QKAA=y
CONFIG_BOARD_PAN1783A_PA_EVB_CPUNET=y
# Enable MPU
CONFIG_ARM_MPU=y
# Enable hardware stack protection
CONFIG_HW_STACK_PROTECTION=y
# enable GPIO
# Enable GPIO
CONFIG_GPIO=y
# clock config
# Enable UART driver
CONFIG_SERIAL=y
# Enable console
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
# Clock config
CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=n

View File

@@ -6,7 +6,7 @@
/dts-v1/;
#include <nordic/nrf5340_cpunet_qkaa.dtsi>
#include "pan1783_cpunet_common.dtsi"
#include "pan1783_nrf5340_cpunet_common.dtsi"
/ {
model = "Panasonic PAN1783A-PA EVB (NRF5340) Network";
@@ -30,4 +30,4 @@
};
/* Include shared RAM configuration file */
#include "pan1783_shared_sram_planning_conf.dtsi"
#include "pan1783_nrf5340_shared_sram_planning_conf.dtsi"

View File

@@ -1,4 +1,4 @@
identifier: pan1783a_pa_evb_cpunet
identifier: pan1783a_pa_evb/nrf5340/cpunet
name: PAN1783A-PA-EVB-network-MCU
type: mcu
arch: arm

View File

@@ -0,0 +1,14 @@
# SPDX-License-Identifier: Apache-2.0
# Enable MPU
CONFIG_ARM_MPU=y
# Enable hardware stack protection
CONFIG_HW_STACK_PROTECTION=y
# Enable GPIO
CONFIG_GPIO=y
# Clock config
CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=n