(mynewt-mcumgr) branch master updated: Allow build when no FLASH_AREA_IMAGE_1 is defined

[jerzy]

This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-mcumgr.git


The following commit(s) were added to refs/heads/master by this push:
     new 03242ec  Allow build when no FLASH_AREA_IMAGE_1 is defined
03242ec is described below

commit 03242ecb716e96c804941203f3bf57dd7f86beb3
Author: Jerzy Kasenberg <jerzy.kasenb...@codecoup.pl>
AuthorDate: Fri Apr 5 09:54:08 2024 +0200

    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.kasenb...@codecoup.pl>
---
 cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

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 @@ img_mgmt_impl_upload_inspect(const struct 
img_mgmt_upload_req *req,
 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 @@ img_mgmt_impl_erase_slot(void)
     }
 
     return 0;
+#endif
 }
 
 int
@@ -392,6 +396,9 @@ int
 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 @@ err:
     g_img_mgmt_state.sector_id = -1;
     g_img_mgmt_state.sector_end = 0;
     return MGMT_ERR_EUNKNOWN;
+#endif
 }
 
 #else
@@ -439,6 +447,9 @@ int
 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 @@ img_mgmt_impl_write_image_data(unsigned int offset, const 
void *data,
     }
 
     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 @@ img_mgmt_impl_erase_image_data(unsigned int off, unsigned 
int num_bytes)
     }
 
     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 @@ img_mgmt_impl_erase_if_needed(uint32_t off, uint32_t len)
 done:
     flash_area_close(cfa);
     return rc;
+#endif
 }
 #endif