subsys/mgmt/hawkbit: Clean up flash map usage
The commit cleans up how flash map labels and definitions are
used.
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
diff --git a/subsys/mgmt/hawkbit/hawkbit.c b/subsys/mgmt/hawkbit/hawkbit.c
index 23e096c..baeb4af 100644
--- a/subsys/mgmt/hawkbit/hawkbit.c
+++ b/subsys/mgmt/hawkbit/hawkbit.c
@@ -50,11 +50,14 @@
#define RESPONSE_BUFFER_SIZE 1100
#define HAWKBIT_RECV_TIMEOUT (300 * MSEC_PER_SEC)
-#define SLOT1_SIZE FLASH_AREA_SIZE(image_1)
#define HTTP_HEADER_CONTENT_TYPE_JSON "application/json;charset=UTF-8"
-#define STORAGE_NODE DT_NODE_BY_FIXED_PARTITION_LABEL(storage)
-#define FLASH_NODE DT_MTD_FROM_FIXED_PARTITION(STORAGE_NODE)
+#define SLOT1_LABEL image_1
+#define SLOT1_SIZE FLASH_AREA_SIZE(SLOT1_LABEL)
+
+#define STORAGE_LABEL storage
+#define STORAGE_DEV FLASH_AREA_DEVICE(STORAGE_LABEL)
+#define STORAGE_OFFSET FLASH_AREA_OFFSET(STORAGE_LABEL)
#if ((CONFIG_HAWKBIT_POLL_INTERVAL > 1) && (CONFIG_HAWKBIT_POLL_INTERVAL < 43200))
static uint32_t poll_sleep = (CONFIG_HAWKBIT_POLL_INTERVAL * 60 * MSEC_PER_SEC);
@@ -572,13 +575,13 @@
struct flash_pages_info info;
int32_t action_id;
- fs.flash_device = DEVICE_DT_GET(FLASH_NODE);
+ fs.flash_device = STORAGE_DEV;
if (!device_is_ready(fs.flash_device)) {
LOG_ERR("Flash device not ready");
return -ENODEV;
}
- fs.offset = FLASH_AREA_OFFSET(storage);
+ fs.offset = STORAGE_OFFSET;
rc = flash_get_page_info_by_offs(fs.flash_device, fs.offset, &info);
if (rc) {
LOG_ERR("Unable to get storage page info: %d", rc);
@@ -607,7 +610,7 @@
}
LOG_DBG("Marked image as OK");
- ret = boot_erase_img_bank(FLASH_AREA_ID(image_1));
+ ret = boot_erase_img_bank(FLASH_AREA_ID(SLOT1_LABEL));
if (ret) {
LOG_ERR("Failed to erase second slot: %d", ret);
return ret;
@@ -1158,7 +1161,7 @@
/* Verify the hash of the stored firmware */
fic.match = hb_context.dl.file_hash;
fic.clen = hb_context.dl.downloaded_size;
- if (flash_img_check(&hb_context.flash_ctx, &fic, FLASH_AREA_ID(image_1))) {
+ if (flash_img_check(&hb_context.flash_ctx, &fic, FLASH_AREA_ID(SLOT1_LABEL))) {
LOG_ERR("Firmware - flash validation has failed");
hb_context.code_status = HAWKBIT_DOWNLOAD_ERROR;
goto cleanup;
