Commit 4aa286d2 authored by Gustavo Henrique Nihei's avatar Gustavo Henrique Nihei Committed by David Brown
Browse files

flash_map: Increase minimum supported write align via flash_area_align 



Signed-off-by: default avatarGustavo Henrique Nihei <gustavo.nihei@espressif.com>
parent ffe4ec9c

boot/bootutil/src/bootutil_misc.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ uint32_t 
boot_status_off(const struct flash_area *fap)

{

    uint32_t off_from_end;

    uint8_t elem_sz;

    uint32_t elem_sz;



    elem_sz = flash_area_align(fap);

boot/bootutil/src/bootutil_public.c

+1 −1
Original line number Diff line number Diff line
@@ -370,8 +370,8 @@ boot_write_trailer(const struct flash_area *fap, uint32_t off, 
        const uint8_t *inbuf, uint8_t inlen)

{

    uint8_t buf[BOOT_MAX_ALIGN];

    uint8_t align;

    uint8_t erased_val;

    uint32_t align;

    int rc;



    align = flash_area_align(fap);

boot/bootutil/src/loader.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ boot_write_status(const struct boot_loader_state *state, struct boot_status *bs) 
    int area_id;

    int rc = 0;

    uint8_t buf[BOOT_MAX_ALIGN];

    uint8_t align;

    uint32_t align;

    uint8_t erased_val;



    /* NOTE: The first sector copied (that is the last sector on slot) contains

boot/cypress/cy_flash_pal/cy_flash_map.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ int flash_area_erase(const struct flash_area *fa, uint32_t off, uint32_t len) 
}



/*< Returns this `flash_area`s alignment */

size_t flash_area_align(const struct flash_area *fa)

uint32_t flash_area_align(const struct flash_area *fa)

{

    int ret = -1;

    if (fa->fa_device_id == FLASH_DEVICE_INTERNAL_FLASH)

boot/cypress/cy_flash_pal/include/flash_map_backend/flash_map_backend.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ int flash_area_write(const struct flash_area *, uint32_t off, 
/*< Erases `len` bytes of flash memory at `off` */

int flash_area_erase(const struct flash_area *, uint32_t off, uint32_t len);

/*< Returns this `flash_area`s alignment */

size_t flash_area_align(const struct flash_area *);

uint32_t flash_area_align(const struct flash_area *);

/*< Initializes an array of flash_area elements for the slot's sectors */

int flash_area_to_sectors(int idx, int *cnt, struct flash_area *ret);

/*< Returns the `fa_id` for slot, where slot is 0 (primary) or 1 (secondary) */

CRA Git | Maintained and supported by SUSTech CRA and CCSE