Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-24 08:44:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ChibiOS: make HAL_FLASH_PROTECTION a boolean, stop checking for definition

Browse Source
This commit is contained in:
Peter Barker 2022-08-15 13:54:08 +10:00 committed by Peter Barker
parent 9f58e7df31
commit ecde9f8c3f
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_ChibiOS/HAL_ChibiOS_Class.cpp
View File

@ -249,7 +249,7 @@ static void main_loop()
utilInstance.apply_persistent_params(); utilInstance.apply_persistent_params();
#endif #endif
#ifdef HAL_FLASH_PROTECTION #if HAL_FLASH_PROTECTION
if (AP_BoardConfig::unlock_flash()) { if (AP_BoardConfig::unlock_flash()) {
stm32_flash_unprotect_flash(); stm32_flash_unprotect_flash();
} else { } else {

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

@ -284,7 +284,7 @@ void stm32_flash_lock(void)
#endif #endif
} }
#if defined(STM32H7) && defined(HAL_FLASH_PROTECTION) #if defined(STM32H7) && HAL_FLASH_PROTECTION
static void stm32_flash_wait_opt_idle(void) static void stm32_flash_wait_opt_idle(void)
{ {
__DSB(); __DSB();
@ -863,7 +863,7 @@ void stm32_flash_protect_flash(bool bootloader, bool protect)
{ {
(void)bootloader; (void)bootloader;
(void)protect; (void)protect;
#if defined(STM32H7) && !defined(HAL_BOOTLOADER_BUILD) && defined(HAL_FLASH_PROTECTION) #if defined(STM32H7) && HAL_FLASH_PROTECTION
uint32_t prg1 = FLASH->WPSN_CUR1; uint32_t prg1 = FLASH->WPSN_CUR1;
uint32_t prg2 = FLASH->WPSN_CUR2; uint32_t prg2 = FLASH->WPSN_CUR2;
#ifndef STORAGE_FLASH_PAGE #ifndef STORAGE_FLASH_PAGE
@ -925,7 +925,7 @@ void stm32_flash_protect_flash(bool bootloader, bool protect)
*/ */
void stm32_flash_unprotect_flash() void stm32_flash_unprotect_flash()
{ {
#if defined(STM32H7) && defined(HAL_FLASH_PROTECTION) #if defined(STM32H7) && HAL_FLASH_PROTECTION
stm32_flash_opt_clear_errors(); stm32_flash_opt_clear_errors();
stm32_flash_clear_errors(); stm32_flash_clear_errors();

15
libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
View File

@ -1146,6 +1146,21 @@ def write_mcu_config(f):
if not args.bootloader: if not args.bootloader:
f.write('''#define STM32_DMA_REQUIRED TRUE\n\n''') f.write('''#define STM32_DMA_REQUIRED TRUE\n\n''')
if args.bootloader:
# do not enable flash protection in bootloader, even if hwdef
# requests it:
f.write('''
#undef HAL_FLASH_PROTECTION
#define HAL_FLASH_PROTECTION 0
''')
else:
# flash protection is off by default:
f.write('''
#ifndef HAL_FLASH_PROTECTION
#define HAL_FLASH_PROTECTION 0
#endif
''')
def write_ldscript(fname): def write_ldscript(fname):
'''write ldscript.ld for this board''' '''write ldscript.ld for this board'''
flash_size = get_config('FLASH_USE_MAX_KB', type=int, default=0) flash_size = get_config('FLASH_USE_MAX_KB', type=int, default=0)