aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_HAL_ChibiOS: entirely remove check_limit_flash_1M if not needed

Browse Source 
taking up valuable space on non-F427 boards
This commit is contained in:
Peter Barker 2023-02-16 11:18:48 +11:00 committed by Andrew Tridgell
parent 5b6b18803e
commit 1cb4bc223d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/AP_Bootloader/AP_Bootloader.cpp
View File

@ -62,9 +62,11 @@ AP_FlashIface_JEDEC ext_flash;
int main(void) int main(void)
{ {
#ifdef STM32F427xx
if (BOARD_FLASH_SIZE > 1024 && check_limit_flash_1M()) { if (BOARD_FLASH_SIZE > 1024 && check_limit_flash_1M()) {
board_info.fw_size = (1024 - (FLASH_BOOTLOADER_LOAD_KB + APP_START_OFFSET_KB))*1024; board_info.fw_size = (1024 - (FLASH_BOOTLOADER_LOAD_KB + APP_START_OFFSET_KB))*1024;
} }
#endif
bool try_boot = false; bool try_boot = false;
uint32_t timeout = HAL_BOOTLOADER_TIMEOUT; uint32_t timeout = HAL_BOOTLOADER_TIMEOUT;

4
libraries/AP_HAL_ChibiOS/hwdef/common/stm32_util.c
View File

@ -565,9 +565,9 @@ unsigned int stm32_rand_generate_nonblocking(unsigned char* output, unsigned int
/* /*
see if we should limit flash to 1M on devices with older revisions of STM32F427 see if we should limit flash to 1M on devices with older revisions of STM32F427
*/ */
#ifdef STM32F427xx
bool check_limit_flash_1M(void) bool check_limit_flash_1M(void)
{ {
#ifdef STM32F427xx
const uint16_t revid = (*(uint32_t *)DBGMCU_BASE) >> 16; const uint16_t revid = (*(uint32_t *)DBGMCU_BASE) >> 16;
static const uint16_t badrevs[4] = { 0x1000, 0x1001, 0x1003, 0x1007 }; static const uint16_t badrevs[4] = { 0x1000, 0x1001, 0x1003, 0x1007 };
for (uint8_t i=0; i<4; i++) { for (uint8_t i=0; i<4; i++) {
@ -575,6 +575,6 @@ bool check_limit_flash_1M(void)
return true; return true;
} }
} }
#endif
return false; return false;
} }
#endif