Revert "[nrf noup] bootloader: Add bootloader requests"

This reverts commit e1f2ab3.

Signed-off-by: Tomasz Chyrowicz <[email protected]>

Author: tomchy

boot/bootutil/include/bootutil/boot_request.h

@@ -51,11 +51,6 @@
 #include "bootutil_priv.h"
 #include "bootutil_misc.h"
 
-#if defined(CONFIG_NRF_MCUBOOT_BOOT_REQUEST) && !defined(CONFIG_MCUBOOT)
-#include <bootutil/boot_request.h>
-#define SEND_BOOT_REQUEST
-#endif /* CONFIG_NRF_MCUBOOT_BOOT_REQUEST && !CONFIG_MCUBOOT */
-
 #ifdef CONFIG_MCUBOOT
 BOOT_LOG_MODULE_DECLARE(mcuboot);
 #else
@@ -508,79 +503,32 @@ boot_write_copy_done(const struct flash_area *fap)
     return boot_write_trailer_flag(fap, off, BOOT_FLAG_SET);
 }
 
-#ifdef SEND_BOOT_REQUEST
-static int
-send_boot_request(uint8_t magic, bool confirm, int image_id, uint32_t slot_id)
-{
-    int rc = BOOT_EBADIMAGE;
-
-    /* Handle write-protected active image. */
-    if ((magic == BOOT_MAGIC_GOOD) || (magic == BOOT_MAGIC_UNSET)) {
-        if (confirm) {
-            BOOT_LOG_DBG("Confirm image: %d, %d", image_id, slot_id);
-            rc = boot_request_confirm_slot(image_id, slot_id);
-        } else {
-            BOOT_LOG_DBG("Set image preference: %d, %d", image_id, slot_id);
-            rc = boot_request_set_preferred_slot(image_id, slot_id);
-        }
-        if (rc != 0) {
-            rc = BOOT_EBADIMAGE;
-        }
-    }
-
-    return rc;
-}
-#endif /* SEND_BOOT_REQUEST */
+#ifndef MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP
 
-#if defined(SEND_BOOT_REQUEST) || (!defined(MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP))
-static int flash_area_to_image_slot(const struct flash_area *fa, uint32_t *slot)
+static int flash_area_to_image(const struct flash_area *fa)
 {
-    int id = flash_area_get_id(fa);
 #if BOOT_IMAGE_NUMBER > 1
     uint8_t i = 0;
+    int id = flash_area_get_id(fa);
 
     while (i < BOOT_IMAGE_NUMBER) {
-        if (FLASH_AREA_IMAGE_PRIMARY(i) == id) {
-            if (slot != NULL) {
-                *slot = 0;
-            }
-            return i;
-        } else if (FLASH_AREA_IMAGE_SECONDARY(i) == id) {
-            if (slot != NULL) {
-                *slot = 1;
-            }
+        if (FLASH_AREA_IMAGE_PRIMARY(i) == id || (FLASH_AREA_IMAGE_SECONDARY(i) == id)) {
             return i;
         }
 
         ++i;
     }
 #else
     (void)fa;
-    if (slot != NULL) {
-        if (FLASH_AREA_IMAGE_PRIMARY(0) == id) {
-            *slot = 0;
-        } else if (FLASH_AREA_IMAGE_SECONDARY(0) == id) {
-            *slot = 1;
-        } else {
-            *slot = UINT32_MAX;
-        }
-    }
 #endif
     return 0;
 }
-#endif /* defined(SEND_BOOT_REQUEST) || (!defined(MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP)) */
 
-#ifndef MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP
 int
 boot_set_next(const struct flash_area *fa, bool active, bool confirm)
 {
     struct boot_swap_state slot_state;
     int rc;
-    int image_id;
-    uint32_t slot_id;
-
-    BOOT_LOG_DBG("boot_set_next: fa %p active == %d, confirm == %d",
-                 fa, (int)active, (int)confirm);
 
     if (active) {
         confirm = true;
@@ -591,15 +539,6 @@ boot_set_next(const struct flash_area *fa, bool active, bool confirm)
         return rc;
     }
 
-    image_id = flash_area_to_image_slot(fa, &slot_id);
-
-#ifdef SEND_BOOT_REQUEST
-    rc = send_boot_request(slot_state.magic, confirm, image_id, slot_id);
-    if ((rc != 0) || active) {
-        return rc;
-    }
-#endif
-
     switch (slot_state.magic) {
     case BOOT_MAGIC_GOOD:
         /* If non-active then swap already scheduled, else confirm needed.*/
@@ -630,7 +569,7 @@ boot_set_next(const struct flash_area *fa, bool active, bool confirm)
                 } else {
                     swap_type = BOOT_SWAP_TYPE_TEST;
                 }
-                rc = boot_write_swap_info(fa, swap_type, image_id);
+                rc = boot_write_swap_info(fa, swap_type, flash_area_to_image(fa));
             }
         }
         break;
@@ -661,10 +600,6 @@ boot_set_next(const struct flash_area *fa, bool active, bool confirm)
 {
     struct boot_swap_state slot_state;
     int rc;
-#ifdef SEND_BOOT_REQUEST
-    int image_id;
-    uint32_t slot_id;
-#endif
 
     BOOT_LOG_DBG("boot_set_next: fa %p active == %d, confirm == %d",
                  fa, (int)active, (int)confirm);
@@ -683,15 +618,6 @@ boot_set_next(const struct flash_area *fa, bool active, bool confirm)
         return rc;
     }
 
-#ifdef SEND_BOOT_REQUEST
-    image_id = flash_area_to_image_slot(fa, &slot_id);
-
-    rc = send_boot_request(slot_state.magic, confirm, image_id, slot_id);
-    if ((rc != 0) || active) {
-        return rc;
-    }
-#endif
-
     switch (slot_state.magic) {
     case BOOT_MAGIC_UNSET:
         /* Magic is needed for MCUboot to even consider booting an image */

boot/bootutil/src/bootutil_public.c

@@ -16,11 +16,6 @@ zephyr_library_named(mcuboot_util)
 zephyr_library_sources(
   ../src/bootutil_public.c
     )
-if(CONFIG_NRF_MCUBOOT_BOOT_REQUEST)
-  zephyr_library_sources_ifdef(CONFIG_NRF_MCUBOOT_BOOT_REQUEST_IMPL_RETENTION
-    src/boot_request_retention.c
-  )
-endif()
 
 # Sensitivity to the TEST_BOOT_IMAGE_ACCESS_HOOKS define is implemented for
 # allowing the test-build with the hooks feature enabled.