zephyr: Allow to select slot for DFU as image
The change alters Zephyr port of mcumgr to use "image" parameter,
from update packet, to identify slot the update should be written to.
The number of available images/slots have also been extended with
image_2 and image_3.
WARNING: Due to mcumgr always sending "erase" command, which is
hardcoded to erase slot number 1, to upload to slot > 2, the -e
switch to mcumgr, which means no erase, image upload is required;
otherwise innocent slot 1 will be erased while other slot is uploaded.
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
diff --git a/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c b/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
index be139c4..afa3e6e 100644
--- a/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
+++ b/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
@@ -91,7 +91,10 @@
}
/**
- * Get flash_area ID for a image slot number.
+ * Get flash_area ID for a image number; actually the slots are images
+ * for Zephyr, as slot 0 of image 0 is image_0, slot 0 of image 1 is
+ * image_2 and so on. The function treats slot numbers as absolute
+ * slot number starting at 0.
*/
static int
zephyr_img_mgmt_flash_area_id(int slot)
@@ -107,6 +110,18 @@
fa_id = FLASH_AREA_ID(image_1);
break;
+#if FLASH_AREA_LABEL_EXISTS(image_2)
+ case 2:
+ fa_id = FLASH_AREA_ID(image_2);
+ break;
+#endif
+
+#if FLASH_AREA_LABEL_EXISTS(image_3)
+ case 3:
+ fa_id = FLASH_AREA_ID(image_3);
+ break;
+#endif
+
default:
fa_id = -1;
break;
@@ -490,7 +505,7 @@
}
}
- action->area_id = img_mgmt_get_unused_slot_area_id(-1);
+ action->area_id = img_mgmt_get_unused_slot_area_id(req->image - 1);
if (action->area_id < 0) {
/* No slot where to upload! */
*errstr = img_mgmt_err_str_no_slot;
