j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix rboot-api sdk_spi_flash_read pointer types

Browse source
This commit is contained in:
Angus Gratton 2016-06-30 09:51:02 +10:00
parent d8bcb5d702
commit bd8e5190e4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extras/rboot-ota/rboot-api.c
View file

@ -249,7 +249,7 @@ bool rboot_verify_image(uint32_t initial_offset, uint32_t *image_length, const c
/* sanity limit on how far we can read */ /* sanity limit on how far we can read */
uint32_t end_limit = offset + 0x100000; uint32_t end_limit = offset + 0x100000;
image_header_t image_header __attribute__((aligned(4))); image_header_t image_header __attribute__((aligned(4)));
if(sdk_spi_flash_read(offset, &image_header, sizeof(image_header_t))) { if(sdk_spi_flash_read(offset, (uint32_t *)&image_header, sizeof(image_header_t))) {
error = "Flash fail"; error = "Flash fail";
goto fail; goto fail;
} }
@ -271,7 +271,7 @@ bool rboot_verify_image(uint32_t initial_offset, uint32_t *image_length, const c
{ {
/* read section header */ /* read section header */
section_header_t header __attribute__((aligned(4))); section_header_t header __attribute__((aligned(4)));
if(sdk_spi_flash_read(offset, &header, sizeof(section_header_t))) { if(sdk_spi_flash_read(offset, (uint32_t *)&header, sizeof(section_header_t))) {
error = "Flash fail"; error = "Flash fail";
goto fail; goto fail;
} }
@ -359,7 +359,7 @@ bool rboot_digest_image(uint32_t offset, uint32_t image_length, rboot_digest_upd
{ {
uint8_t buf[32] __attribute__((aligned(4))); uint8_t buf[32] __attribute__((aligned(4)));
for(int i = 0; i < image_length; i += sizeof(buf)) { for(int i = 0; i < image_length; i += sizeof(buf)) {
if(sdk_spi_flash_read(offset+i, buf, sizeof(buf))) if(sdk_spi_flash_read(offset+i, (uint32_t *)buf, sizeof(buf)))
return false; return false;
uint32_t digest_len = sizeof(buf); uint32_t digest_len = sizeof(buf);
if(i + digest_len > image_length) if(i + digest_len > image_length)