suit: Add manifest-based recovery method

Modifications to the build system to support running the
app_recovery manifest without a recovery image.

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

Author: ahasztag

cmake/sysbuild/suit.cmake

@@ -39,7 +39,7 @@ function(suit_register_post_build_commands)
     list(APPEND dependencies "${BINARY_DIR}/zephyr/${BINARY_FILE}.bin")
   endforeach()
 
-  if(SB_CONFIG_SUIT_BUILD_RECOVERY)
+  if(SB_CONFIG_SUIT_BUILD_RECOVERY AND NOT SB_CONFIG_SUIT_RECOVERY_APPLICATION_NONE)
     list(APPEND dependencies recovery)
   endif()
 

sysbuild/Kconfig.suit

@@ -184,6 +184,11 @@ config SUIT_RECOVERY_APPLICATION_DEFAULT
 	help
 	  Use the default recovery application using BluetoothLE and SMP.
 
+config SUIT_RECOVERY_APPLICATION_NONE
+	bool "Do not build the recovery application"
+	help
+	  Provide a recovery manifest, but do not build a recovery application.
+
 endchoice
 
 choice SUIT_RECOVERY_APPLICATION_IMAGE_MANIFEST

sysbuild/suit.cmake

@@ -20,7 +20,7 @@ if(SB_CONFIG_SUIT_BUILD_FLASH_COMPANION)
   )
 endif()
 
-if(SB_CONFIG_SUIT_BUILD_RECOVERY)
+if(SB_CONFIG_SUIT_BUILD_RECOVERY AND NOT SB_CONFIG_SUIT_RECOVERY_APPLICATION_NONE)
   # Calculate the network board target
   string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}")
   list(GET split_board_qualifiers 1 target_soc)

sysbuild/suit_provisioning/Kconfig.nrf54h20

@@ -45,7 +45,7 @@ manifest-independent-updates=y
 manifest-signature-check=DISABLED
 manifest-mpi-offset=0x2030
 
-menuconfig  SUIT_MPI_$(manifest)
+menuconfig SUIT_MPI_$(manifest)
 	bool "Application recovery manifest configuration"
 	default y if SUIT_BUILD_RECOVERY
 
@@ -58,7 +58,7 @@ manifest-independent-updates=n
 manifest-signature-check=DISABLED
 manifest-mpi-offset=0x2060
 
-menuconfig  SUIT_MPI_$(manifest)
+menuconfig SUIT_MPI_$(manifest)
 	bool "Application local (1) manifest configuration"
 	default y
 
@@ -71,7 +71,7 @@ manifest-independent-updates=n
 manifest-signature-check=DISABLED
 manifest-mpi-offset=0x2090
 
-menuconfig  SUIT_MPI_$(manifest)
+menuconfig SUIT_MPI_$(manifest)
 	bool "Application local (2) manifest configuration"
 
 rsource "Kconfig.template.manifest_config"
@@ -83,7 +83,7 @@ manifest-independent-updates=n
 manifest-signature-check=DISABLED
 manifest-mpi-offset=0x20c0
 
-menuconfig  SUIT_MPI_$(manifest)
+menuconfig SUIT_MPI_$(manifest)
 	bool "Application local (3) manifest configuration"
 	default y if SUIT_RECOVERY_APPLICATION_IMAGE_MANIFEST_APP_LOCAL_3
 
@@ -113,9 +113,9 @@ manifest-independent-updates=n
 manifest-signature-check=DISABLED
 manifest-mpi-offset=0x1000
 
-menuconfig  SUIT_MPI_$(manifest)
+menuconfig SUIT_MPI_$(manifest)
 	bool "Radio recovery manifest configuration"
-	default y if SUIT_BUILD_RECOVERY
+	default y if SUIT_BUILD_RECOVERY && !SUIT_RECOVERY_APPLICATION_NONE
 
 rsource "Kconfig.template.manifest_config"
 
@@ -126,7 +126,7 @@ manifest-independent-updates=n
 manifest-signature-check=DISABLED
 manifest-mpi-offset=0x1030
 
-menuconfig  SUIT_MPI_$(manifest)
+menuconfig SUIT_MPI_$(manifest)
 	bool "Radio local (1) manifest configuration"
 	default y
 
@@ -139,7 +139,7 @@ manifest-independent-updates=n
 manifest-signature-check=DISABLED
 manifest-mpi-offset=0x1060
 
-menuconfig  SUIT_MPI_$(manifest)
+menuconfig SUIT_MPI_$(manifest)
 	bool "Radio local (2) manifest configuration"
 
 rsource "Kconfig.template.manifest_config"

sysbuild/suit_provisioning/Kconfig.nrf9280

@@ -111,7 +111,7 @@ manifest-mpi-offset=0x2000
 
 menuconfig SUIT_MPI_$(manifest)
 	bool "Radio recovery manifest configuration"
-	default y if SUIT_BUILD_RECOVERY
+	default y if SUIT_BUILD_RECOVERY && !SUIT_RECOVERY_APPLICATION_NONE
 
 rsource "Kconfig.template.manifest_config"