From 5e7b211b79e9ec24db81941aebb488dcd4d1cb30 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 20 Jan 2024 07:52:07 +1100 Subject: [PATCH] HAL_ChibiOS: moved M4 disable into H757 script this fixes assert checking in the bootloader and for boards other than CubeRedPrimary --- libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary/hwdef.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32H757xx.py | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary/hwdef.dat index 76d2add5d9..95690d2316 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary/hwdef.dat @@ -46,10 +46,6 @@ CANFD_SUPPORTED 8 STM32_ST_USE_TIMER 12 -# disable core m4 use to silence the asserts -# checking allocation of peripherals -define STM32_HAS_M4 0 - define CH_CFG_ST_RESOLUTION 16 # use last 2 pages for flash storage diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32H757xx.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32H757xx.py index f781463e29..d849d07aed 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32H757xx.py +++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32H757xx.py @@ -71,6 +71,9 @@ mcu = { 'HAL_HAVE_HARDWARE_DOUBLE' : '1', 'HAL_WITH_MCU_MONITORING' : '1', 'STM32H7' : '1', + # disable core m4 use to silence the asserts + # checking allocation of peripherals + 'STM32_HAS_M4' : '0', } }