Commit 453e8bd7 authored by Dominik Ermel's avatar Dominik Ermel Committed by David Brown
Browse files

flash_map_backend: Remove flash_area_id_to_image_slot 



The function has not been in use and some ports have not been
implementing it anyway.

Signed-off-by: default avatarDominik Ermel <dominik.ermel@nordicsemi.no>
parent b26fc487

boot/cypress/cy_flash_pal/cy_flash_map.c

+0 −5
Original line number Diff line number Diff line
@@ -438,11 +438,6 @@ int flash_area_id_to_multi_image_slot(int image_index, int area_id) 
    return -1;

}



int flash_area_id_to_image_slot(int area_id)

{

    return flash_area_id_to_multi_image_slot(0, area_id);

}



uint8_t flash_area_erased_val(const struct flash_area *fap)

{

    int ret = 0;

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

+0 −2
Original line number Diff line number Diff line
@@ -172,8 +172,6 @@ uint32_t flash_area_align(const struct flash_area *); 
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) */

int flash_area_id_from_image_slot(int slot);

/*< Returns the slot, for the `fa_id` supplied */

int flash_area_id_to_image_slot(int area_id);



int flash_area_id_from_multi_image_slot(int image_index, int slot);

int flash_area_id_to_multi_image_slot(int image_index, int area_id);

boot/mbed/include/flash_map_backend/flash_map_backend.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ int flash_area_id_from_image_slot(int slot); 
int flash_area_id_from_multi_image_slot(int image_index, int slot);





int flash_area_id_to_image_slot(int area_id);

/**

 * Converts the specified flash area ID and image index (in multi-image setup)

 * to an image slot index.

boot/mbed/src/flash_map_backend.cpp

+0 −4
Original line number Diff line number Diff line
@@ -231,10 +231,6 @@ int flash_area_id_from_image_slot(int slot) { 
    return slot;

}



int flash_area_id_to_image_slot(int area_id) {

    return area_id;

}



/**

 * Multi images support not implemented yet

 */

boot/zephyr/flash_map_extended.c

+0 −5
Original line number Diff line number Diff line
@@ -83,11 +83,6 @@ int flash_area_id_to_multi_image_slot(int image_index, int area_id) 
    return -1;

}



int flash_area_id_to_image_slot(int area_id)

{

    return flash_area_id_to_multi_image_slot(0, area_id);

}



#if defined(CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD)

int flash_area_id_from_direct_image(int image_id)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE