You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ut...@apache.org on 2020/05/15 11:03:36 UTC
[mynewt-mcumgr] 01/02: zephyr: Convert to new FLASH_AREA macros
This is an automated email from the ASF dual-hosted git repository.
utzig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-mcumgr.git
commit ce01c4840948dd05c116023a5a2f518b5512e5cf
Author: Kumar Gala <ku...@linaro.org>
AuthorDate: Thu May 7 17:09:29 2020 -0500
zephyr: Convert to new FLASH_AREA macros
Signed-off-by: Kumar Gala <ku...@linaro.org>
---
cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c | 12 ++++++------
samples/smp_svr/zephyr/src/main.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
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 e5db289..3bf30b5 100644
--- a/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
+++ b/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
@@ -95,16 +95,16 @@ zephyr_img_mgmt_flash_area_id(int slot)
switch (slot) {
case 0:
- fa_id = DT_FLASH_AREA_IMAGE_0_ID;
+ fa_id = FLASH_AREA_ID(image_0);
break;
case 1:
- fa_id = DT_FLASH_AREA_IMAGE_1_ID;
+ fa_id = FLASH_AREA_ID(image_1);
break;
default:
assert(0);
- fa_id = DT_FLASH_AREA_IMAGE_1_ID;
+ fa_id = FLASH_AREA_ID(image_1);
break;
}
@@ -189,14 +189,14 @@ img_mgmt_impl_erase_slot(void)
bool empty;
int rc;
- rc = zephyr_img_mgmt_flash_check_empty(DT_FLASH_AREA_IMAGE_1_ID,
+ rc = zephyr_img_mgmt_flash_check_empty(FLASH_AREA_ID(image_1),
&empty);
if (rc != 0) {
return MGMT_ERR_EUNKNOWN;
}
if (!empty) {
- rc = boot_erase_img_bank(DT_FLASH_AREA_IMAGE_1_ID);
+ rc = boot_erase_img_bank(FLASH_AREA_ID(image_1));
if (rc != 0) {
return MGMT_ERR_EUNKNOWN;
}
@@ -318,7 +318,7 @@ img_mgmt_impl_erase_image_data(unsigned int off, unsigned int num_bytes)
const struct flash_area *fa;
int rc;
- rc = flash_area_open(DT_FLASH_AREA_IMAGE_1_ID, &fa);
+ rc = flash_area_open(FLASH_AREA_ID(image_1), &fa);
if (rc != 0) {
return MGMT_ERR_EUNKNOWN;
}
diff --git a/samples/smp_svr/zephyr/src/main.c b/samples/smp_svr/zephyr/src/main.c
index 6937a5b..066ec9b 100644
--- a/samples/smp_svr/zephyr/src/main.c
+++ b/samples/smp_svr/zephyr/src/main.c
@@ -65,7 +65,7 @@ FS_LITTLEFS_DECLARE_DEFAULT_CONFIG(cstorage);
static struct fs_mount_t littlefs_mnt = {
.type = FS_LITTLEFS,
.fs_data = &cstorage,
- .storage_dev = (void *)DT_FLASH_AREA_STORAGE_ID,
+ .storage_dev = (void *)FLASH_AREA_ID(storage),
.mnt_point = "/lfs"
};
#endif