From f00d6331965829f214f1f8635ba35021a09e2a62 Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Thu, 29 Nov 2018 12:52:49 -0800
Subject: [PATCH] flashfs:Upstream renamed up_progmem_erasepage to
up_progmem_eraseblock
---
src/lib/parameters/flashparams/flashfs.c | 6 +++---
src/modules/dataman/dataman.cpp | 2 +-
src/systemcmds/bl_update/bl_update.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/parameters/flashparams/flashfs.c b/src/lib/parameters/flashparams/flashfs.c
index bce8336c15..dd84ff3517 100644
--- a/src/lib/parameters/flashparams/flashfs.c
+++ b/src/lib/parameters/flashparams/flashfs.c
@@ -645,11 +645,11 @@ static sector_descriptor_t *get_sector_info(flash_entry_header_t *current)
static int erase_sector(sector_descriptor_t *sm, flash_entry_header_t *pf)
{
int rv = 0;
- ssize_t page = up_progmem_getpage((size_t)pf);
+ ssize_t block = up_progmem_getpage((size_t)pf);
- if (page > 0 && page == sm->page) {
+ if (block > 0 && block == sm->page) {
last_erased = sm->page;
- ssize_t size = up_progmem_erasepage(page);
+ ssize_t size = up_progmem_eraseblock(block);
if (size < 0 || size != (ssize_t)sm->size) {
rv = size;
diff --git a/src/modules/dataman/dataman.cpp b/src/modules/dataman/dataman.cpp
index be754f411e..549caedde9 100644
--- a/src/modules/dataman/dataman.cpp
+++ b/src/modules/dataman/dataman.cpp
@@ -1020,7 +1020,7 @@ _ram_flash_flush()
dm_operations_data.ram_flash.flush_timeout_usec = 0;
ssize_t ret = up_progmem_getpage(k_dataman_flash_sector->address);
- ret = up_progmem_erasepage(ret);
+ ret = up_progmem_eraseblock(ret);
if (ret < 0) {
PX4_WARN("Error erasing flash sector %u", k_dataman_flash_sector->page);
diff --git a/src/systemcmds/bl_update/bl_update.c b/src/systemcmds/bl_update/bl_update.c
index 86ee48afab..9dab870dac 100644
--- a/src/systemcmds/bl_update/bl_update.c
+++ b/src/systemcmds/bl_update/bl_update.c
@@ -162,7 +162,7 @@ bl_update_main(int argc, char *argv[])
const size_t page = 0;
uint8_t *base = (uint8_t *) PX4_FLASH_BASE;
- ssize_t size = up_progmem_erasepage(page);
+ ssize_t size = up_progmem_eraseblock(page);
if (size != BL_FILE_SIZE_LIMIT)
{