boards: arm: nrf5340dk_nrf5340: move defaults to Kconfig.defconfig

Kconfig.defconfig is the file meant for adjusting other Kconfig options
defaults. Also removed some redundant default conditions.

Signed-off-by: Gerard Marull-Paretas <[email protected]>

Author: gmarull

boards/arm/nrf5340dk_nrf5340/Kconfig

@@ -3,45 +3,6 @@
 # Copyright (c) 2019 - 2021 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-config IPM_NRFX
-	default IPM
-
-config MBOX_NRFX_IPC
-	default MBOX
-
-config RPMSG_SERVICE_DUAL_IPM_SUPPORT
-	default RPMSG_SERVICE
-
-if RPMSG_SERVICE_DUAL_IPM_SUPPORT
-
-config IPM_MSG_CH_0_ENABLE
-	default y
-
-config IPM_MSG_CH_1_ENABLE
-	default y
-
-config RPMSG_SERVICE_IPM_TX_NAME
-	default "IPM_0" if RPMSG_SERVICE_MODE_MASTER
-	default "IPM_1" if RPMSG_SERVICE_MODE_REMOTE
-
-config RPMSG_SERVICE_IPM_RX_NAME
-	default "IPM_1" if RPMSG_SERVICE_MODE_MASTER
-	default "IPM_0" if RPMSG_SERVICE_MODE_REMOTE
-
-config IPM_MSG_CH_0_TX
-	default RPMSG_SERVICE_MODE_MASTER
-
-config IPM_MSG_CH_0_RX
-	default RPMSG_SERVICE_MODE_REMOTE
-
-config IPM_MSG_CH_1_TX
-	default RPMSG_SERVICE_MODE_REMOTE
-
-config IPM_MSG_CH_1_RX
-	default RPMSG_SERVICE_MODE_MASTER
-
-endif # RPMSG_SERVICE_DUAL_IPM_SUPPORT
-
 if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
 
 config BOARD_ENABLE_DCDC_APP
@@ -59,16 +20,6 @@ config BOARD_ENABLE_DCDC_HV
 	select SOC_DCDC_NRF53X_HV
 	default y
 
-choice BT_HCI_BUS_TYPE
-	default BT_RPMSG if BT
-endchoice
-
-config HEAP_MEM_POOL_SIZE
-	default 4096 if BT_RPMSG
-
-config BT_HCI_VS
-	default y if BT
-
 config BOARD_ENABLE_CPUNET
 	bool "NRF53 Network MCU"
 	help
@@ -85,7 +36,7 @@ config BOARD_ENABLE_CPUNET
 
 config DOMAIN_CPUNET_BOARD
 	string
-	default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+	default "nrf5340dk_nrf5340_cpunet"
 	depends on BOARD_ENABLE_CPUNET
 	help
 	  The board which will be used for CPUNET domain when creating a multi
@@ -95,22 +46,11 @@ config DOMAIN_CPUNET_BOARD
 
 endif #  BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
 
-if BOARD_NRF5340DK_NRF5340_CPUNET
-
-# BT_CTLR depends on BT. When BT is enabled we should default to also
-# enabling the controller.
-config BT_CTLR
-	default y if BT
-
-config BT_ECC
-	default y if BT
-
 config DOMAIN_CPUAPP_BOARD
 	string
-	default "nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUNET
+	default "nrf5340dk_nrf5340_cpuapp"
+	depends on BOARD_NRF5340DK_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
 	  another board.
-
-endif # BOARD_NRF5340DK_NRF5340_CPUNET

boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig

@@ -76,3 +76,68 @@ endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
 
 config BOARD
 	default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUNET
+
+config IPM_NRFX
+	default IPM
+
+config MBOX_NRFX_IPC
+	default MBOX
+
+config RPMSG_SERVICE_DUAL_IPM_SUPPORT
+	default RPMSG_SERVICE
+
+if RPMSG_SERVICE_DUAL_IPM_SUPPORT
+
+config IPM_MSG_CH_0_ENABLE
+	default y
+
+config IPM_MSG_CH_1_ENABLE
+	default y
+
+config RPMSG_SERVICE_IPM_TX_NAME
+	default "IPM_0" if RPMSG_SERVICE_MODE_MASTER
+	default "IPM_1" if RPMSG_SERVICE_MODE_REMOTE
+
+config RPMSG_SERVICE_IPM_RX_NAME
+	default "IPM_1" if RPMSG_SERVICE_MODE_MASTER
+	default "IPM_0" if RPMSG_SERVICE_MODE_REMOTE
+
+config IPM_MSG_CH_0_TX
+	default RPMSG_SERVICE_MODE_MASTER
+
+config IPM_MSG_CH_0_RX
+	default RPMSG_SERVICE_MODE_REMOTE
+
+config IPM_MSG_CH_1_TX
+	default RPMSG_SERVICE_MODE_REMOTE
+
+config IPM_MSG_CH_1_RX
+	default RPMSG_SERVICE_MODE_MASTER
+
+endif # RPMSG_SERVICE_DUAL_IPM_SUPPORT
+
+if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+
+choice BT_HCI_BUS_TYPE
+	default BT_RPMSG if BT
+endchoice
+
+config HEAP_MEM_POOL_SIZE
+	default 4096 if BT_RPMSG
+
+config BT_HCI_VS
+	default y if BT
+
+endif #  BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+
+if BOARD_NRF5340DK_NRF5340_CPUNET
+
+# BT_CTLR depends on BT. When BT is enabled we should default to also
+# enabling the controller.
+config BT_CTLR
+	default y if BT
+
+config BT_ECC
+	default y if BT
+
+endif # BOARD_NRF5340DK_NRF5340_CPUNET