diff --git a/firmware/hw_layer/ports/stm32/rusEfiStartup.S b/firmware/hw_layer/ports/stm32/rusEfiStartup.S index c256501c9b..9be2b23b30 100644 --- a/firmware/hw_layer/ports/stm32/rusEfiStartup.S +++ b/firmware/hw_layer/ports/stm32/rusEfiStartup.S @@ -15,8 +15,9 @@ .thumb_func // end of 'I have no idea' - .global rusEfiAsboluteStartupMethod -rusEfiAsboluteStartupMethod: + // ChibiOS defines it's Reset_Handler 'weak' - by defining out handler this becomes firmware entry point + .global Reset_Handler +Reset_Handler: // [rusefi][DFU][start] // Clive Two.Zero is the God of ST community forum // Device specific, if in doubt RTFM @@ -27,7 +28,7 @@ STR R0, [R0, #0] // Invalidate CMP R2, R1 BEQ UseDFU // DFU bootloader not needed, jump back to normal ChibiOS startup - bl rusEfiAsboluteStartupMethodReturnPoint + bl _crt0_entry UseDFU: // AN2606 Application note // STM32 microcontroller system memory boot mode diff --git a/firmware/svnversion.h b/firmware/svnversion.h index a0a7c260bc..dad6699e3d 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,12 +1,12 @@ // This file was generated by Version2Header -// Fri Aug 02 20:45:22 EDT 2019 +// Sat Aug 03 20:42:36 EDT 2019 #ifndef GIT_HASH -#define GIT_HASH "91f9a50b3f917c9e597dd6d28a2711e551f56807" +#define GIT_HASH "33a488aa5498ab79728f573a977237a60e401976" #endif #ifndef VCS_VERSION -#define VCS_VERSION "19641" +#define VCS_VERSION "19645" #endif