commit 24769883097b920b7c351f8cc606b36bbbc36297
author Dominik Ermel <dominik.ermel@nordicsemi.no> Thu Jan 05 13:36:35 2023 +0000
committer David Brown <davidb@davidb.org> Tue Mar 14 08:13:20 2023 -0600
tree f5d23677b908595c5e94d1c5995e73583b8702ef
parent bd0d94ce4bd85bd7139b696442df927c3ed508d5

boot: Switch to flash_area_get_sector.

Replace flash_area_sector_from_off calls with flash_area_get_sector.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>

boot/boot_serial/src/boot_serial.c

diff --git a/boot/boot_serial/src/boot_serial.c b/boot/boot_serial/src/boot_serial.c
index 1e453d8..e346280 100644
--- a/boot/boot_serial/src/boot_serial.c
+++ b/boot/boot_serial/src/boot_serial.c
@@ -318,7 +318,7 @@
         return start;
     }
 
-    if (flash_area_sector_from_off(end, &sect)) {
+    if (flash_area_get_sector(fap, end, &sect)) {
         return -EINVAL;
     }
 
@@ -437,7 +437,7 @@
          * TODO: This is single occurrence issue, it should get detected during tests
          * and fixed otherwise you are deploying broken mcuboot.
          */
-        if (flash_area_sector_from_off(boot_status_off(fap), &status_sector)) {
+        if (flash_area_get_sector(fap, boot_status_off(fap), &status_sector)) {
             rc = MGMT_ERR_EUNKNOWN;
             BOOT_LOG_ERR("Unable to determine flash sector of the image trailer");
             goto out;

boot/bootutil/src/bootutil_misc.c

diff --git a/boot/bootutil/src/bootutil_misc.c b/boot/bootutil/src/bootutil_misc.c
index 6080758..e800766 100644
--- a/boot/bootutil/src/bootutil_misc.c
+++ b/boot/bootutil/src/bootutil_misc.c
@@ -350,7 +350,7 @@
 #elif defined(MCUBOOT_SWAP_USING_MOVE)
     struct flash_sector sector;
     /* get the last sector offset */
-    int rc = flash_area_sector_from_off(boot_status_off(fap), &sector);
+    int rc = flash_area_get_sector(fap, boot_status_off(fap), &sector);
     if (rc) {
         BOOT_LOG_ERR("Unable to determine flash sector of the image trailer");
         return 0; /* Returning of zero here should cause any check which uses