[nrf noup] boot: Fix test failing with bootloader requests

ahasztag · nvlsianpu · commit 7b333ffd5ba2 · 2025-09-11T08:49:45.000+02:00
nrf-squash! [nrf noup] boot: Improve bootloader request handling

Setting "test" for image was failing when using bootloader
requests due to an incorrect value being returned
from send_boot_request.

Signed-off-by: Artur Hadasz &lt;artur.hadasz@nordicsemi.no&gt;
diff --git a/boot/bootutil/src/bootutil_public.c b/boot/bootutil/src/bootutil_public.c
@@ -524,10 +524,12 @@ send_boot_request(uint8_t magic, uint8_t image_ok, bool confirm, int image_id,
             } else {
                 rc = 0;
             }
-#ifdef CONFIG_NCS_MCUBOOT_BOOT_REQUEST_TEST_SETS_BOOT_PREFERENCE
         } else {
+#ifdef CONFIG_NCS_MCUBOOT_BOOT_REQUEST_TEST_SETS_BOOT_PREFERENCE
             BOOT_LOG_DBG("Set image preference: %d, %d", image_id, slot_id);
             rc = boot_request_set_preferred_slot(image_id, slot_id);
+#else
+            rc = 0;
 #endif /* CONFIG_NCS_MCUBOOT_BOOT_REQUEST_TEST_SETS_BOOT_PREFERENCE */
         }
         if (rc != 0) {

Original file line number	Diff line number	Diff line change
`@@ -524,10 +524,12 @@ send_boot_request(uint8_t magic, uint8_t image_ok, bool confirm, int image_id,`
`524`	`524`	`} else {`
`525`	`525`	`rc = 0;`
`526`	`526`	`}`
`527`		`-#ifdef CONFIG_NCS_MCUBOOT_BOOT_REQUEST_TEST_SETS_BOOT_PREFERENCE`
`528`	`527`	`} else {`
	`528`	`+#ifdef CONFIG_NCS_MCUBOOT_BOOT_REQUEST_TEST_SETS_BOOT_PREFERENCE`
`529`	`529`	`BOOT_LOG_DBG("Set image preference: %d, %d", image_id, slot_id);`
`530`	`530`	`rc = boot_request_set_preferred_slot(image_id, slot_id);`
	`531`	`+#else`
	`532`	`+ rc = 0;`
`531`	`533`	`#endif /* CONFIG_NCS_MCUBOOT_BOOT_REQUEST_TEST_SETS_BOOT_PREFERENCE */`
`532`	`534`	`}`
`533`	`535`	`if (rc != 0) {`