Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HAL_ChibiOS: use compressed ROMFS for bootloader update

This commit is contained in:
Andrew Tridgell 2018-07-09 16:47:09 +10:00
parent d2996677cf
commit 27c435e217
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_HAL_ChibiOS/Util.cpp
View File

@ -202,7 +202,7 @@ bool Util::flash_bootloader()
uint32_t fw_size; uint32_t fw_size;
const char *fw_name = "bootloader.bin"; const char *fw_name = "bootloader.bin";
const uint8_t *fw = AP_ROMFS::find_file(fw_name, fw_size); uint8_t *fw = AP_ROMFS::find_decompress(fw_name, fw_size);
if (!fw) { if (!fw) {
hal.console->printf("failed to find %s\n", fw_name); hal.console->printf("failed to find %s\n", fw_name);
return false; return false;
@ -211,12 +211,14 @@ bool Util::flash_bootloader()
const uint32_t addr = stm32_flash_getpageaddr(0); const uint32_t addr = stm32_flash_getpageaddr(0);
if (!memcmp(fw, (const void*)addr, fw_size)) { if (!memcmp(fw, (const void*)addr, fw_size)) {
hal.console->printf("Bootloader up-to-date\n"); hal.console->printf("Bootloader up-to-date\n");
free(fw);
return true; return true;
} }
hal.console->printf("Erasing\n"); hal.console->printf("Erasing\n");
if (!stm32_flash_erasepage(0)) { if (!stm32_flash_erasepage(0)) {
hal.console->printf("Erase failed\n"); hal.console->printf("Erase failed\n");
free(fw);
return false; return false;
} }
hal.console->printf("Flashing %s @%08x\n", fw_name, (unsigned int)addr); hal.console->printf("Flashing %s @%08x\n", fw_name, (unsigned int)addr);
@ -233,10 +235,12 @@ bool Util::flash_bootloader()
continue; continue;
} }
hal.console->printf("Flash OK\n"); hal.console->printf("Flash OK\n");
free(fw);
return true; return true;
} }
hal.console->printf("Flash failed after %u attempts\n", max_attempts); hal.console->printf("Flash failed after %u attempts\n", max_attempts);
free(fw);
return false; return false;
} }