Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Bootloader: Add support for skipping the cleared flash check

Browse Source
This commit is contained in:
Michael du Breuil 2022-10-06 17:14:38 -07:00 committed by Andrew Tridgell
parent 82f0544e57
commit b846bc9d77
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tools/AP_Bootloader/bl_protocol.cpp
View File

@ -116,6 +116,8 @@
#define PROTO_EXTF_READ_MULTI 0x36 // read bytes at address and increment #define PROTO_EXTF_READ_MULTI 0x36 // read bytes at address and increment
#define PROTO_EXTF_GET_CRC 0x37 // compute & return a CRC of data in external flash #define PROTO_EXTF_GET_CRC 0x37 // compute & return a CRC of data in external flash
#define PROTO_CHIP_FULL_ERASE 0x40 // erase program area and reset program address, skip any flash wear optimization and force an erase
#define PROTO_PROG_MULTI_MAX 64 // maximum PROG_MULTI size #define PROTO_PROG_MULTI_MAX 64 // maximum PROG_MULTI size
#define PROTO_READ_MULTI_MAX 255 // size of the size field #define PROTO_READ_MULTI_MAX 255 // size of the size field
@ -597,6 +599,9 @@ bootloader(unsigned timeout)
// erase failure: INSYNC/FAILURE // erase failure: INSYNC/FAILURE
// //
case PROTO_CHIP_ERASE: case PROTO_CHIP_ERASE:
#if defined(STM32F7) || defined(STM32H7)
case PROTO_CHIP_FULL_ERASE:
#endif
if (!done_sync || !CHECK_GET_DEVICE_FINISHED(done_get_device_flags)) { if (!done_sync || !CHECK_GET_DEVICE_FINISHED(done_get_device_flags)) {
// lower chance of random data on a uart triggering erase // lower chance of random data on a uart triggering erase
@ -621,7 +626,11 @@ bootloader(unsigned timeout)
// erase all sectors // erase all sectors
for (uint8_t i = 0; flash_func_sector_size(i) != 0; i++) { for (uint8_t i = 0; flash_func_sector_size(i) != 0; i++) {
#if defined(STM32F7) || defined(STM32H7)
if (!flash_func_erase_sector(i, c == PROTO_CHIP_FULL_ERASE)) {
#else
if (!flash_func_erase_sector(i)) { if (!flash_func_erase_sector(i)) {
#endif
goto cmd_fail; goto cmd_fail;
} }
} }

4
Tools/AP_Bootloader/support.cpp
View File

@ -139,9 +139,9 @@ uint32_t flash_func_sector_size(uint32_t sector)
return stm32_flash_getpagesize(flash_base_page+sector); return stm32_flash_getpagesize(flash_base_page+sector);
} }
bool flash_func_erase_sector(uint32_t sector) bool flash_func_erase_sector(uint32_t sector, bool force_erase)
{ {
if (!stm32_flash_ispageerased(flash_base_page+sector)) { if (force_erase || !stm32_flash_ispageerased(flash_base_page+sector)) {
return stm32_flash_erasepage(flash_base_page+sector); return stm32_flash_erasepage(flash_base_page+sector);
} }
return true; return true;

2
Tools/AP_Bootloader/support.h
View File

@ -25,7 +25,7 @@ uint32_t flash_func_read_word(uint32_t offset);
bool flash_func_write_word(uint32_t offset, uint32_t v); bool flash_func_write_word(uint32_t offset, uint32_t v);
bool flash_func_write_words(uint32_t offset, uint32_t *v, uint8_t n); bool flash_func_write_words(uint32_t offset, uint32_t *v, uint8_t n);
uint32_t flash_func_sector_size(uint32_t sector); uint32_t flash_func_sector_size(uint32_t sector);
bool flash_func_erase_sector(uint32_t sector); bool flash_func_erase_sector(uint32_t sector, bool force_erase = false);
uint32_t flash_func_read_otp(uint32_t idx); uint32_t flash_func_read_otp(uint32_t idx);
uint32_t flash_func_read_sn(uint32_t idx); uint32_t flash_func_read_sn(uint32_t idx);
void flash_set_keep_unlocked(bool); void flash_set_keep_unlocked(bool);