drivers: mpsl: Disable flash sync if no DFU on nRF54H

This commit disables the flash synchronization via RPC
on nRF54H20 if there is no SUIT.

This is done to fix test samples for which a different
radio core image than ipc_radio is used, thus RPC
communication fails to bind.

Ref: DRGN-25035

Signed-off-by: Artur Hadasz <[email protected]>

Author: ahasztag

applications/ipc_radio/Kconfig

@@ -67,11 +67,6 @@ config BT_MAX_CONN
 
 endif # IPC_RADIO_BT
 
-config IPC_RADIO_USE_RPC_FLASH_SYNC_CONTROLLER
-	bool
-	default y if SOC_NRF54H20_CPURAD
-	imply SOC_FLASH_NRF_RADIO_SYNC_RPC_CONTROLLER
-
 module = IPC_RADIO
 module-str = "ipc_radio"
 source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"

drivers/mpsl/flash_sync/Kconfig

@@ -6,6 +6,13 @@
 
 if SOC_FLASH_NRF || SOC_FLASH_NRF_RRAM || SOC_NRF54H20
 
+config SOC_FLASH_NRF_RADIO_SYNC_RPC
+	bool "Enable flash driver synchronization with radio protocols through RPC"
+	help
+	  Enable the flash synchronization between the application core and the radio core.
+	  This Kconfig option is set based on the value of the SB_CONFIG_SOC_FLASH_NRF_RADIO_SYNC_RPC
+	  sysbuild configuration option.
+
 choice SOC_FLASH_NRF_RADIO_SYNC_CHOICE
 	prompt "Nordic nRFx flash driver synchronization"
 	default SOC_FLASH_NRF_RADIO_SYNC_MPSL if MPSL
@@ -19,7 +26,8 @@ config SOC_FLASH_NRF_RADIO_SYNC_MPSL
 config SOC_FLASH_NRF_RADIO_SYNC_RPC_HOST
 	bool "Nordic nRFx flash driver synchronized on the application core via RPC"
 	depends on SOC_NRF54H20_CPUAPP
-	depends on BT # If synchronization with other radio protocols is needed, extend this
+	depends on BT  # If sync with other radio protocols is needed, extend this
+	depends on SOC_FLASH_NRF_RADIO_SYNC_RPC
 	select NRF_RPC
 	select NRF_RPC_CBOR
 	help
@@ -32,6 +40,7 @@ endif
 
 config SOC_FLASH_NRF_RADIO_SYNC_RPC_CONTROLLER
 	bool "Nordic nRFx flash driver RPC synchronization controller"
+	default y if SOC_FLASH_NRF_RADIO_SYNC_RPC
 	depends on SOC_FLASH_NRF_RADIO_SYNC_MPSL
 	select NRF_RPC
 	select NRF_RPC_CBOR

samples/suit/ab/sysbuild/hci_ipc.conf

@@ -12,5 +12,3 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
 CONFIG_LOG=n
 CONFIG_LOG_PRINTK=n
 CONFIG_UART_CONSOLE=n
-
-CONFIG_SOC_FLASH_NRF_RADIO_SYNC_RPC_CONTROLLER=y

samples/suit/smp_transfer/sysbuild/hci_ipc.conf

@@ -12,5 +12,3 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
 CONFIG_LOG=n
 CONFIG_LOG_PRINTK=n
 CONFIG_UART_CONSOLE=n
-
-CONFIG_SOC_FLASH_NRF_RADIO_SYNC_RPC_CONTROLLER=y

sysbuild/Kconfig.suit

@@ -314,7 +314,11 @@ endif # SUIT_BUILD_FLASH_COMPANION
 
 config SUIT_BUILD_AB_UPDATE
 	bool "Build AB variant"
+	imply SUIT_SOC_FLASH_NRF_RADIO_SYNC_RPC
 	help
 	  Build two applications for the A and B update.
 
+config SUIT_SOC_FLASH_NRF_RADIO_SYNC_RPC
+	bool "Enable flash driver synchronization with radio protocols through RPC"
+
 endmenu

sysbuild/suit.cmake

@@ -65,3 +65,11 @@ if(SB_CONFIG_SUIT_BUILD_AB_UPDATE)
     set_config_bool(${variant_image} CONFIG_NRF_REGTOOL_GENERATE_UICR n)
   endforeach()
 endif()
+
+if(SB_CONFIG_SUIT_SOC_FLASH_NRF_RADIO_SYNC_RPC)
+  get_property(images GLOBAL PROPERTY sysbuild_images)
+
+  foreach(image ${images})
+    set_config_bool(${image} CONFIG_SOC_FLASH_NRF_RADIO_SYNC_RPC y)
+  endforeach()
+endif()