commit 03242ecb716e96c804941203f3bf57dd7f86beb3
author Jerzy Kasenberg <jerzy.kasenberg@codecoup.pl> Fri Apr 05 09:54:08 2024 +0200
committer kasjer <kasjer@users.noreply.github.com> Tue Apr 16 11:04:36 2024 +0200
tree d21250aa7fbb1c8d6bbeefc6a89276e74e9e5cc0
parent 545f2b214402b46b7d8c2ffb86b7b65996c93422

Allow build when no FLASH_AREA_IMAGE_1 is defined

Normally two flash areas are available FLASH_AREA_IMAGE_0
and FLASH_AREA_IMAGE_1.

For cases bootloader is able to write to FLASH_AREA_IMAGE_0
directly (USB DFU) bsp used to define fake FLASH_AREA_IMAGE_1
with empty size. Bootloader with DFU functionality other
then mcumgr still uses img_mgmt functions to confirm image.
This change changes functions that operate on FLASH_AREA_IMAGE_1
to return MGMT_ERR_ENOTSUP when FLASH_AREA_IMAGE_1 is not defined.
This allows to have bsp.yml without artificial zero sized areas.

Signed-off-by: Jerzy Kasenberg <jerzy.kasenberg@codecoup.pl>

cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt.c

diff --git a/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt.c b/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt.c
index f75b00d..b56e3a6 100644
--- a/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt.c
+++ b/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt.c
@@ -254,6 +254,9 @@
 int
 img_mgmt_impl_erase_slot(void)
 {
+#ifndef FLASH_AREA_IMAGE_1
+    return MGMT_ERR_ENOTSUP;
+#else
     const struct flash_area *fa;
     bool empty;
     int rc;
@@ -276,6 +279,7 @@
     }
 
     return 0;
+#endif
 }
 
 int
@@ -392,6 +396,9 @@
 img_mgmt_impl_write_image_data(unsigned int offset, const void *data,
                                unsigned int num_bytes, bool last)
 {
+#ifndef FLASH_AREA_IMAGE_1
+    return MGMT_ERR_ENOTSUP;
+#else
     const struct flash_area *fa;
     struct flash_area sector;
     int rc;
@@ -432,6 +439,7 @@
     g_img_mgmt_state.sector_id = -1;
     g_img_mgmt_state.sector_end = 0;
     return MGMT_ERR_EUNKNOWN;
+#endif
 }
 
 #else
@@ -439,6 +447,9 @@
 img_mgmt_impl_write_image_data(unsigned int offset, const void *data,
                                unsigned int num_bytes, bool last)
 {
+#ifndef FLASH_AREA_IMAGE_1
+    return MGMT_ERR_ENOTSUP;
+#else
     const struct flash_area *fa;
     int rc;
 
@@ -454,12 +465,16 @@
     }
 
     return 0;
+#endif
 }
 #endif
 
 int
 img_mgmt_impl_erase_image_data(unsigned int off, unsigned int num_bytes)
 {
+#ifndef FLASH_AREA_IMAGE_1
+    return MGMT_ERR_ENOTSUP;
+#else
     const struct flash_area *fa;
     int rc;
 
@@ -475,12 +490,16 @@
     }
 
     return 0;
+#endif
 }
 
 #if MYNEWT_VAL(IMG_MGMT_LAZY_ERASE)
 int
 img_mgmt_impl_erase_if_needed(uint32_t off, uint32_t len)
 {
+#ifndef FLASH_AREA_IMAGE_1
+    return MGMT_ERR_ENOTSUP;
+#else
     int rc = 0;
     struct flash_area sector;
     const struct flash_area *cfa;
@@ -506,6 +525,7 @@
 done:
     flash_area_close(cfa);
     return rc;
+#endif
 }
 #endif