nrf5x_bsim: Add defines for COMPATIBLE_NRF53X_CPUNET

Select COMPATIBLE_NRF53X_CPUNET in SOC_NRF5340_CPUNET.
Also add defined(CONFIG_SOC_SERIES_NRF53X) where we
have defined(NRF53_SERIES).

Signed-off-by: Aurora Sletnes Bjørlo <[email protected]>

Author: auroraslb

soc/arm/nordic_nrf/nrf53/Kconfig.soc

@@ -67,6 +67,7 @@ config SOC_NRF5340_CPUAPP
 
 config SOC_NRF5340_CPUNET
 	depends on SOC_SERIES_NRF53X
+	select SOC_COMPATIBLE_NRF53X_CPUNET
 	bool
 	select HAS_HW_NRF_ACL
 	select HAS_HW_NRF_CLOCK

subsys/bluetooth/controller/hci/nordic/hci_vendor.h

@@ -10,7 +10,7 @@
 #define BT_HCI_VS_HW_VAR  BT_HCI_VS_HW_VAR_NORDIC_NRF51X
 #elif defined(CONFIG_SOC_COMPATIBLE_NRF52X)
 #define BT_HCI_VS_HW_VAR  BT_HCI_VS_HW_VAR_NORDIC_NRF52X
-#elif defined(CONFIG_SOC_SERIES_NRF53X)
+#elif defined(CONFIG_SOC_SERIES_NRF53X) || defined(CONFIG_SOC_COMPATIBLE_NRF53X_CPUNET)
 #define BT_HCI_VS_HW_VAR  BT_HCI_VS_HW_VAR_NORDIC_NRF53X
 #endif
 #else

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c

@@ -206,7 +206,8 @@ void radio_pkt_configure(uint8_t bits_len, uint8_t max_len, uint8_t flags)
 		bits_len = 5U;
 	}
 #elif defined(CONFIG_SOC_COMPATIBLE_NRF52X) || \
-	defined(CONFIG_SOC_SERIES_NRF53X)
+	defined(CONFIG_SOC_SERIES_NRF53X) || \
+	defined(CONFIG_SOC_COMPATIBLE_NRF53X_CPUNET)
 	extra = 0U;
 
 	phy = (flags >> 1) & 0x07; /* phy */

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h

@@ -603,7 +603,7 @@ static inline void hal_radio_sw_switch_ppi_group_setup(void)
 
 #endif /* !CONFIG_BT_CTLR_TIFS_HW */
 
-#elif defined(CONFIG_SOC_NRF5340_CPUNET)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X_CPUNET)
 
 #include <hal/nrf_dppi.h>
 

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/swi.h

@@ -18,10 +18,10 @@
 #endif
 
 /* nRF53 Series IRQ mapping */
-#elif defined(CONFIG_SOC_SERIES_NRF53X)
+#elif defined(CONFIG_SOC_SERIES_NRF53X) || defined(CONFIG_SOC_COMPATIBLE_NRF53X_CPUNET)
 
 /* nRF53 Series Engineering D and Revision 1 IRQ mapping */
-#if defined(CONFIG_SOC_NRF5340_CPUNET) && \
+#if (defined(CONFIG_SOC_NRF5340_CPUNET) || defined(CONFIG_SOC_COMPATIBLE_NRF53X_CPUNET)) && \
 	!defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET)
 
 #define HAL_SWI_RADIO_IRQ  SWI2_IRQn