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

HAL_ChibiOS: fixed flash space on 16k bl boards 

this avoids the stm32_flash_recent_erase() function which added around
800 bytes to the bootloader. It is not needed
This commit is contained in:
Andrew Tridgell 2020-12-16 12:41:26 +11:00
parent 62758ffd99
commit b4201436dd
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_ChibiOS/Scheduler.cpp
View File

@ -345,7 +345,7 @@ bool Scheduler::in_expected_delay(void) const
return true;
}
}
#ifndef HAL_NO_FLASH_SUPPORT
#if !defined(HAL_NO_FLASH_SUPPORT) && !defined(HAL_BOOTLOADER_BUILD)
if (stm32_flash_recent_erase()) {
return true;
}

8
libraries/AP_HAL_ChibiOS/hwdef/common/flash.c
View File

@ -335,7 +335,9 @@ bool stm32_flash_ispageerased(uint32_t page)
return true;
}
#ifndef HAL_BOOTLOADER_BUILD
static uint32_t last_erase_ms;
#endif
/*
erase a page
@ -346,7 +348,9 @@ bool stm32_flash_erasepage(uint32_t page)
return false;
}
#ifndef HAL_BOOTLOADER_BUILD
last_erase_ms = hrt_millis32();
#endif
#if STM32_FLASH_DISABLE_ISR
syssts_t sts = chSysGetStatusAndLockX();
@ -407,7 +411,9 @@ bool stm32_flash_erasepage(uint32_t page)
chSysRestoreStatusX(sts);
#endif
#ifndef HAL_BOOTLOADER_BUILD
last_erase_ms = hrt_millis32();
#endif
return stm32_flash_ispageerased(page);
}
@ -663,6 +669,7 @@ void stm32_flash_keep_unlocked(bool set)
}
}
#ifndef HAL_BOOTLOADER_BUILD
/*
return true if we had a recent erase
*/
@ -670,6 +677,7 @@ bool stm32_flash_recent_erase(void)
{
return hrt_millis32() - last_erase_ms < 3000U;
}
#endif
#endif // HAL_NO_FLASH_SUPPORT

2
libraries/AP_HAL_ChibiOS/hwdef/common/flash.h
View File

@ -27,7 +27,9 @@ bool stm32_flash_erasepage(uint32_t page);
bool stm32_flash_write(uint32_t addr, const void *buf, uint32_t count);
void stm32_flash_keep_unlocked(bool set);
bool stm32_flash_ispageerased(uint32_t page);
#ifndef HAL_BOOTLOADER_BUILD
bool stm32_flash_recent_erase(void);
#endif
#ifdef __cplusplus
}
#endif