OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

nuttx: switch to flash_area_get_sector 

Function flash_area_sector_from_off is replaced with newly used
flash_area_get_sector to cope with calls in bootutil_misc.c file.

This is required for CONFIG_MCUBOOT_SWAP_USING_MOVE to work correctly.

Signed-off-by: Michal Lenc <michallenc@seznam.cz>
This commit is contained in:
Michal Lenc 2023-08-01 10:54:55 +02:00 committed by Andrzej Puzdrowski
parent 61898dad92
commit aa7e2b1faa
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boot/nuttx/include/flash_map_backend/flash_map_backend.h
View File

@ -107,12 +107,13 @@ static inline uint8_t flash_area_get_device_id(const struct flash_area *fa)
} }
/**************************************************************************** /****************************************************************************
* Name: flash_area_sector_from_off * Name: flash_area_get_sector
* *
* Description: * Description:
* Retrieve the flash sector a given offset belongs to. * Retrieve the flash sector a given offset belongs to.
* *
* Input Parameters: * Input Parameters:
* fap - flash area structure
* off - address offset. * off - address offset.
* sector - flash sector * sector - flash sector
* *
@ -121,7 +122,8 @@ static inline uint8_t flash_area_get_device_id(const struct flash_area *fa)
* *
****************************************************************************/ ****************************************************************************/
int flash_area_sector_from_off(off_t off, struct flash_sector *fs); int flash_area_get_sector(const struct flash_area *fap, off_t off,
struct flash_sector *fs);
/**************************************************************************** /****************************************************************************
* Name: flash_area_get_off * Name: flash_area_get_off

17
boot/nuttx/src/flash_map_backend/flash_map_backend.c
View File

@ -812,12 +812,13 @@ int flash_area_id_from_image_offset(uint32_t offset)
} }
/**************************************************************************** /****************************************************************************
* Name: flash_area_sector_from_off * Name: flash_area_get_sector
* *
* Description: * Description:
* Retrieve the flash sector a given offset belongs to. * Retrieve the flash sector a given offset belongs to.
* *
* Input Parameters: * Input Parameters:
* fap - flash area structure
* off - address offset. * off - address offset.
* sector - flash sector * sector - flash sector
* *
@ -826,15 +827,17 @@ int flash_area_id_from_image_offset(uint32_t offset)
* *
****************************************************************************/ ****************************************************************************/
int flash_area_sector_from_off(off_t off, struct flash_sector *fs) int flash_area_get_sector(const struct flash_area *fap, off_t off,
struct flash_sector *fs)
{ {
struct flash_device_s *dev = lookup_flash_device_by_offset(off); off_t offset = fap->fa_off + off;
struct flash_device_s *dev = lookup_flash_device_by_offset(offset);
if (dev == NULL) if (dev == NULL)
{ {
return -errno; return -errno;
} }
fs->fs_off = (off / dev->mtdgeo.erasesize) * dev->mtdgeo.erasesize; fs->fs_off = (offset / dev->mtdgeo.erasesize) * dev->mtdgeo.erasesize;
fs->fs_size = dev->mtdgeo.erasesize; fs->fs_size = dev->mtdgeo.erasesize;
return 0; return 0;