Commit f1801fac authored by Ioannis Glaropoulos's avatar Ioannis Glaropoulos Committed by Carles Cufi
Browse files

boards: arm: nrf5340: refactor common board Kconfig structure 



Refactor the common Kconfig and build files of nRF5340
board definition to enable building for either nRF5340
PDK or DK.

Signed-off-by: default avatarIoannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
parent 6b93b493

boards/arm/nrf5340pdk_nrf5340/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line 
# Copyright (c) 2019 Nordic Semiconductor ASA.

# SPDX-License-Identifier: Apache-2.0



if ((CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS)

if (((CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS)

    OR (CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS))

    AND CONFIG_BOARD_ENABLE_CPUNET)

zephyr_library()

zephyr_library_sources(nrf5340_cpunet_reset.c)

boards/arm/nrf5340pdk_nrf5340/Kconfig

+6 −6
Original line number Diff line number Diff line 
# nRF5340 PDK board configuration

# nRF5340 (P)DK board configuration



# Copyright (c) 2019 Nordic Semiconductor ASA

# Copyright (c) 2019 - 2020 Nordic Semiconductor ASA

# SPDX-License-Identifier: Apache-2.0



if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS

if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS



config BOARD_ENABLE_DCDC_APP

	bool "Enable Application MCU DCDC converter"
@@ -43,9 +43,9 @@ config BOARD_ENABLE_CPUNET 
	  may already have started the Network MCU.

	default y if (BT || NET_L2_IEEE802154)



endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS

endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS



if BOARD_NRF5340PDK_NRF5340_CPUNET

if BOARD_NRF5340PDK_NRF5340_CPUNET || BOARD_NRF5340DK_NRF5340_CPUNET



# BT_CTLR depends on BT. When BT is enabled we should default to also

# enabling the controller.
@@ -55,4 +55,4 @@ config BT_CTLR 
config BT_ECC

	default y if BT



endif # BOARD_NRF5340PDK_NRF5340_CPUNET
 
endif # BOARD_NRF5340PDK_NRF5340_CPUNET || BOARD_NRF5340DK_NRF5340_CPUNET

boards/arm/nrf5340pdk_nrf5340/Kconfig.board

+11 −1
Original line number Diff line number Diff line 
# nRF5340 PDK NRF5340 board configuration

# nRF5340 (P)DK NRF5340 board configuration



# Copyright (c) 2019-2020 Nordic Semiconductor ASA

# SPDX-License-Identifier: Apache-2.0
@@ -11,8 +11,18 @@ config BOARD_NRF5340PDK_NRF5340_CPUAPP 
config BOARD_NRF5340PDK_NRF5340_CPUAPPNS

	bool "nRF5340 PDK nRF5340 Application MCU non-secure"



config BOARD_NRF5340DK_NRF5340_CPUAPP

	bool "nRF5340 DK nRF5340 Application MCU"



config BOARD_NRF5340DK_NRF5340_CPUAPPNS

	bool "nRF5340 DK nRF5340 Application MCU non-secure"



endif # SOC_NRF5340_CPUAPP_QKAA



config BOARD_NRF5340PDK_NRF5340_CPUNET

	bool "nRF5340 PDK NRF5340 Network MCU"

	depends on SOC_NRF5340_CPUNET_QKAA



config BOARD_NRF5340DK_NRF5340_CPUNET

	bool "nRF5340 DK NRF5340 Network MCU"

	depends on SOC_NRF5340_CPUNET_QKAA

boards/arm/nrf5340pdk_nrf5340/Kconfig.defconfig

+11 −10
Original line number Diff line number Diff line 
# nRF5340 PDK nRF5340 board configuration

# nRF5340 (P)DK nRF5340 board configuration



# Copyright (c) 2019-2020 Nordic Semiconductor ASA

# SPDX-License-Identifier: Apache-2.0



if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS

if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS



config BOARD

	default "nrf5340pdk_nrf5340_cpuapp"

	default "nrf5340pdk_nrf5340_cpuapp" if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS

	default "nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS



# Code Partition:

#
@@ -36,7 +37,7 @@ config BOARD 
DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition

DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition



if BOARD_NRF5340PDK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE

if (BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) && TRUSTED_EXECUTION_SECURE



config FLASH_LOAD_SIZE

	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
@@ -44,9 +45,9 @@ config FLASH_LOAD_SIZE 
config SRAM_SIZE

	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K)



endif # BOARD_NRF5340PDK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE

endif # (BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) && TRUSTED_EXECUTION_SECURE



if BOARD_NRF5340PDK_NRF5340_CPUAPPNS

if BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPPNS



config FLASH_LOAD_OFFSET

	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
@@ -54,10 +55,10 @@ config FLASH_LOAD_OFFSET 
config FLASH_LOAD_SIZE

	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))



endif # BOARD_NRF5340PDK_NRF5340_CPUAPPNS

endif # BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPPNS



endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS

endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS



config BOARD

	default "nrf5340pdk_nrf5340_cpunet"

	depends on BOARD_NRF5340PDK_NRF5340_CPUNET
 
	default "nrf5340pdk_nrf5340_cpunet" if BOARD_NRF5340PDK_NRF5340_CPUNET

	default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUNET

boards/arm/nrf5340pdk_nrf5340/board.cmake

+3 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: Apache-2.0



if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS)

if((CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS) OR

  (CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS))

board_runner_args(nrfjprog "--nrf-family=NRF53" "--tool-opt=--coprocessor CP_APPLICATION")

board_runner_args(jlink "--device=cortex-m33" "--speed=4000")

endif()



if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET)

if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET)

board_runner_args(nrfjprog "--nrf-family=NRF53" "--tool-opt=--coprocessor CP_NETWORK")

endif()

CRA Git | Maintained and supported by SUSTech CRA and CCSE