boot/zephyr: Move RAM load Kconfigs outside !SINGLE_APPLICATION_SLOT

Now that RAM load code is not dependent on bootutil/loader.c, it can be
used independently of !SINGLE_APPLICATION_SLOT configurations. Move the
related Kconfigs accordingly, so that applications configured to use
single loader can do RAM loading.

Signed-off-by: Ederson de Souza <[email protected]>

Author: edersondisouza

boot/zephyr/Kconfig

@@ -211,6 +211,7 @@ config BOOT_PREFER_SWAP_MOVE
 if !SINGLE_APPLICATION_SLOT
 choice BOOT_IMAGE_UPGRADE_MODE
 	prompt "Image upgrade modes"
+	default BOOT_NO_UPGRADE if BOOT_RAM_LOAD
 	default BOOT_SWAP_USING_MOVE if BOOT_PREFER_SWAP_MOVE
 	default BOOT_SWAP_USING_SCRATCH
 
@@ -248,15 +249,6 @@ config BOOT_DIRECT_XIP
 	  images must be linked to be executed from the given image slot. Using this
 	  mode results in a simpler code path and smaller code size.
 
-config BOOT_RAM_LOAD
-	bool "RAM load"
-	help
-	  If y, mcuboot selects the newest valid image based on the image version
-	  numbers, thereafter the selected image is copied to RAM and executed from
-	  there. For this reason, the image has to be linked to be executed from RAM.
-	  The address that the image is copied to is specified using the load-addr
-	  argument to the imgtool.py script which writes it to the image header.
-
 config BOOT_FIRMWARE_LOADER
 	bool "Firmware loader"
 	help
@@ -269,20 +261,13 @@ config BOOT_FIRMWARE_LOADER
 	  Note: The firmware loader image must be signed with the same signing
 	  key as the primary image.
 
-endchoice
-
-# Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_SRAM := zephyr,sram
-
-if BOOT_RAM_LOAD
-config BOOT_IMAGE_EXECUTABLE_RAM_START
-	hex "Boot image executable ram start"
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_SRAM))
+config BOOT_NO_UPGRADE
+	bool "No upgrade"
+	help
+	  No upgrade is performed - usually, this option will be used in
+	  conjunction with BOOT_RAM_LOAD.
 
-config BOOT_IMAGE_EXECUTABLE_RAM_SIZE
-	int "Boot image executable base size"
-	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM),0)
-endif
+endchoice
 
 config BOOT_DIRECT_XIP_REVERT
 	bool "Enable the revert mechanism in direct-xip mode"
@@ -320,6 +305,28 @@ config BOOT_SWAP_SAVE_ENCTLV
 
 endif # !SINGLE_APPLICATION_SLOT
 
+config BOOT_RAM_LOAD
+	bool "RAM load"
+	help
+	  If y, mcuboot selects the newest valid image based on the image version
+	  numbers, thereafter the selected image is copied to RAM and executed from
+	  there. For this reason, the image has to be linked to be executed from RAM.
+	  The address that the image is copied to is specified using the load-addr
+	  argument to the imgtool.py script which writes it to the image header.
+
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_SRAM := zephyr,sram
+
+if BOOT_RAM_LOAD
+config BOOT_IMAGE_EXECUTABLE_RAM_START
+	hex "Boot image executable ram start"
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_SRAM))
+
+config BOOT_IMAGE_EXECUTABLE_RAM_SIZE
+	int "Boot image executable base size"
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM),0)
+endif
+
 config BOOT_ENCRYPTION_SUPPORT
 	bool
 	help

boot/zephyr/include/mcuboot_config/mcuboot_config.h

@@ -82,12 +82,6 @@
 #define MCUBOOT_DIRECT_XIP_REVERT
 #endif
 
-#ifdef CONFIG_BOOT_RAM_LOAD
-#define MCUBOOT_RAM_LOAD 1
-#define IMAGE_EXECUTABLE_RAM_START CONFIG_BOOT_IMAGE_EXECUTABLE_RAM_START
-#define IMAGE_EXECUTABLE_RAM_SIZE CONFIG_BOOT_IMAGE_EXECUTABLE_RAM_SIZE
-#endif
-
 #ifdef CONFIG_BOOT_FIRMWARE_LOADER
 #define MCUBOOT_FIRMWARE_LOADER
 #endif
@@ -108,6 +102,12 @@
 
 #endif /* CONFIG_SINGLE_APPLICATION_SLOT */
 
+#ifdef CONFIG_BOOT_RAM_LOAD
+#define MCUBOOT_RAM_LOAD 1
+#define IMAGE_EXECUTABLE_RAM_START CONFIG_BOOT_IMAGE_EXECUTABLE_RAM_START
+#define IMAGE_EXECUTABLE_RAM_SIZE CONFIG_BOOT_IMAGE_EXECUTABLE_RAM_SIZE
+#endif
+
 #ifdef CONFIG_LOG
 #define MCUBOOT_HAVE_LOGGING 1
 #endif