diff --git a/.gitmodules b/.gitmodules index 44f6da237c..de894b04fc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "firmware/ChibiOS-Contrib"] +[submodule "firmware/ChibiOS-Contrib"] path = firmware/ChibiOS-Contrib url = https://github.com/ChibiOS/ChibiOS-Contrib.git diff --git a/firmware/chibios/file.lst b/firmware/chibios/file.lst deleted file mode 100644 index f3d84bd725..0000000000 --- a/firmware/chibios/file.lst +++ /dev/null @@ -1,172 +0,0 @@ -os/hal/hal.mk -os/hal/include/adc.h -os/hal/include/can.h -os/hal/include/ext.h -os/hal/include/gpt.h -os/hal/include/hal.h -os/hal/include/i2c.h -os/hal/include/icu.h -os/hal/include/io_block.h -os/hal/include/io_channel.h -os/hal/include/mac.h -os/hal/include/mii.h -os/hal/include/mmcsd.h -os/hal/include/mmc_spi.h -os/hal/include/pal.h -os/hal/include/pwm.h -os/hal/include/rtc.h -os/hal/include/sdc.h -os/hal/include/serial.h -os/hal/include/serial_usb.h -os/hal/include/spi.h -os/hal/include/tm.h -os/hal/include/uart.h -os/hal/include/usb.h -os/hal/platforms/STM32/can_lld.c -os/hal/platforms/STM32/can_lld.h -os/hal/platforms/STM32/ext_lld.c -os/hal/platforms/STM32/ext_lld.h -os/hal/platforms/STM32/GPIOv2/pal_lld.c -os/hal/platforms/STM32/GPIOv2/pal_lld.h -os/hal/platforms/STM32/i2s_lld.c -os/hal/platforms/STM32/i2s_lld.h -os/hal/platforms/STM32/mac_lld.c -os/hal/platforms/STM32/mac_lld.h -os/hal/platforms/STM32/OTGv1/stm32_otg.h -os/hal/platforms/STM32/OTGv1/usb_lld.c -os/hal/platforms/STM32/OTGv1/usb_lld.h -os/hal/platforms/STM32/RTCv2/rtc_lld.c -os/hal/platforms/STM32/RTCv2/rtc_lld.h -os/hal/platforms/STM32/sdc_lld.c -os/hal/platforms/STM32/sdc_lld.h -os/hal/platforms/STM32/SPIv1/spi_lld.c -os/hal/platforms/STM32/SPIv1/spi_lld.h -os/hal/platforms/STM32/stm32.h -os/hal/platforms/STM32/TIMv1/gpt_lld.c -os/hal/platforms/STM32/TIMv1/gpt_lld.h -os/hal/platforms/STM32/TIMv1/icu_lld.c -os/hal/platforms/STM32/TIMv1/icu_lld.h -os/hal/platforms/STM32/TIMv1/pwm_lld.c -os/hal/platforms/STM32/TIMv1/pwm_lld.h -os/hal/platforms/STM32/TIMv1/stm32_tim.h -os/hal/platforms/STM32/USARTv1/serial_lld.c -os/hal/platforms/STM32/USARTv1/serial_lld.h -os/hal/platforms/STM32/USARTv1/uart_lld.c -os/hal/platforms/STM32/USARTv1/uart_lld.h -os/hal/platforms/STM32F4xx/adc_lld.c -os/hal/platforms/STM32F4xx/adc_lld.h -os/hal/platforms/STM32F4xx/ext_lld_isr.c -os/hal/platforms/STM32F4xx/ext_lld_isr.h -os/hal/platforms/STM32F4xx/hal_lld.c -os/hal/platforms/STM32F4xx/hal_lld.h -os/hal/platforms/STM32F4xx/platform.dox -os/hal/platforms/STM32F4xx/platform.mk -os/hal/platforms/STM32F4xx/stm32f2xx.h -os/hal/platforms/STM32F4xx/stm32f4xx.h -os/hal/platforms/STM32F4xx/stm32_dma.c -os/hal/platforms/STM32F4xx/stm32_dma.h -os/hal/platforms/STM32F4xx/stm32_isr.h -os/hal/platforms/STM32F4xx/stm32_rcc.h -os/hal/src/adc.c -os/hal/src/can.c -os/hal/src/ext.c -os/hal/src/gpt.c -os/hal/src/hal.c -os/hal/src/i2c.c -os/hal/src/icu.c -os/hal/src/mac.c -os/hal/src/mmcsd.c -os/hal/src/mmc_spi.c -os/hal/src/pal.c -os/hal/src/pwm.c -os/hal/src/rtc.c -os/hal/src/sdc.c -os/hal/src/serial.c -os/hal/src/serial_usb.c -os/hal/src/spi.c -os/hal/src/tm.c -os/hal/src/uart.c -os/hal/src/usb.c -os/kernel/include/ch.h -os/kernel/include/chbsem.h -os/kernel/include/chcond.h -os/kernel/include/chdebug.h -os/kernel/include/chdynamic.h -os/kernel/include/chevents.h -os/kernel/include/chfiles.h -os/kernel/include/chheap.h -os/kernel/include/chinline.h -os/kernel/include/chlists.h -os/kernel/include/chmboxes.h -os/kernel/include/chmemcore.h -os/kernel/include/chmempools.h -os/kernel/include/chmsg.h -os/kernel/include/chmtx.h -os/kernel/include/chqueues.h -os/kernel/include/chregistry.h -os/kernel/include/chschd.h -os/kernel/include/chsem.h -os/kernel/include/chstreams.h -os/kernel/include/chsys.h -os/kernel/include/chthreads.h -os/kernel/include/chvt.h -os/kernel/kernel.mk -os/kernel/src/chcond.c -os/kernel/src/chdebug.c -os/kernel/src/chdynamic.c -os/kernel/src/chevents.c -os/kernel/src/chheap.c -os/kernel/src/chlists.c -os/kernel/src/chmboxes.c -os/kernel/src/chmemcore.c -os/kernel/src/chmempools.c -os/kernel/src/chmsg.c -os/kernel/src/chmtx.c -os/kernel/src/chqueues.c -os/kernel/src/chregistry.c -os/kernel/src/chschd.c -os/kernel/src/chsem.c -os/kernel/src/chsys.c -os/kernel/src/chthreads.c -os/kernel/src/chvt.c -os/ports/common/ARMCMx/CMSIS/include/arm_common_tables.h -os/ports/common/ARMCMx/CMSIS/include/arm_math.h -os/ports/common/ARMCMx/CMSIS/include/core_cm0.h -os/ports/common/ARMCMx/CMSIS/include/core_cm0plus.h -os/ports/common/ARMCMx/CMSIS/include/core_cm3.h -os/ports/common/ARMCMx/CMSIS/include/core_cm4.h -os/ports/common/ARMCMx/CMSIS/include/core_cm4_simd.h -os/ports/common/ARMCMx/CMSIS/include/core_cmFunc.h -os/ports/common/ARMCMx/CMSIS/include/core_cmInstr.h -os/ports/common/ARMCMx/CMSIS/readme.txt -os/ports/common/ARMCMx/nvic.c -os/ports/common/ARMCMx/nvic.h -os/ports/GCC/ARMCMx/chcore.c -os/ports/GCC/ARMCMx/chcore.h -os/ports/GCC/ARMCMx/chcore_v7m.c -os/ports/GCC/ARMCMx/chcore_v7m.h -os/ports/GCC/ARMCMx/chtypes.h -os/ports/GCC/ARMCMx/crt0.c -os/ports/GCC/ARMCMx/rules.mk -os/ports/GCC/ARMCMx/STM32F4xx/cmparams.h -os/ports/GCC/ARMCMx/STM32F4xx/port.mk -os/ports/GCC/ARMCMx/STM32F4xx/vectors.c -os/ports/IAR/ARMCMx/chcore.c -os/ports/IAR/ARMCMx/chcore.h -os/ports/IAR/ARMCMx/chcoreasm_v6m.s -os/ports/IAR/ARMCMx/chcoreasm_v7m.s -os/ports/IAR/ARMCMx/chcore_v6m.c -os/ports/IAR/ARMCMx/chcore_v6m.h -os/ports/IAR/ARMCMx/chcore_v7m.c -os/ports/IAR/ARMCMx/chcore_v7m.h -os/ports/IAR/ARMCMx/chtypes.h -os/ports/IAR/ARMCMx/cstartup.s -os/ports/IAR/ARMCMx/STM32F4xx/cmparams.h -os/ports/IAR/ARMCMx/STM32F4xx/vectors.s -os/various/chprintf.c -os/various/chprintf.h -os/various/fatfs_diskio.c -os/various/fatfs_syscall.c -os/various/memstreams.c -os/various/memstreams.h -os/various/various.mk diff --git a/firmware/chibios/rusefi_chibios.patch b/firmware/chibios/rusefi_chibios.patch deleted file mode 100644 index 2237a8ca7a..0000000000 --- a/firmware/chibios/rusefi_chibios.patch +++ /dev/null @@ -1,111 +0,0 @@ -Index: boards/ST_STM32F4_DISCOVERY/board.h -=================================================================== ---- boards/ST_STM32F4_DISCOVERY/board.h (revision 2723) -+++ boards/ST_STM32F4_DISCOVERY/board.h (working copy) -@@ -27,6 +27,7 @@ - #define BOARD_ST_STM32F4_DISCOVERY - #define BOARD_NAME "STMicroelectronics STM32F4-Discovery" - -+#define STM32_LSECLK 32768 - - /* - * Board oscillators-related settings. -Index: os/kernel/src/chdebug.c -=================================================================== ---- os/kernel/src/chdebug.c (revision 2723) -+++ os/kernel/src/chdebug.c (working copy) -@@ -114,7 +114,7 @@ - void dbg_check_lock(void) { - - if ((dbg_isr_cnt != 0) || (dbg_lock_cnt != 0)) -- chDbgPanic("SV#4"); -+ chDbgPanic("SV#4 misplaced chSysLock()"); - dbg_enter_lock(); - } - -@@ -138,7 +138,7 @@ - void dbg_check_lock_from_isr(void) { - - if ((dbg_isr_cnt <= 0) || (dbg_lock_cnt != 0)) -- chDbgPanic("SV#6"); -+ chDbgPanic("SV#6 misplaced chSysLockFromIsr"); - dbg_enter_lock(); - } - -@@ -193,7 +193,7 @@ - void chDbgCheckClassI(void) { - - if ((dbg_isr_cnt < 0) || (dbg_lock_cnt <= 0)) -- chDbgPanic("SV#10"); -+ chDbgPanic("SV#10 misplaced I-class function"); - } - - /** -@@ -268,10 +268,11 @@ - * - * @param[in] msg the pointer to the panic message string - */ -+ -+void chDbgPanic3(const char *msg, char * file, int line); -+ - void chDbgPanic(const char *msg) { -- -- dbg_panic_msg = msg; -- chSysHalt(); -+ chDbgPanic3(msg, __FILE__, __LINE__); - } - #endif /* CH_DBG_ENABLED */ - -Index: os/ports/GCC/ARMCMx/chcore_v7m.h -=================================================================== ---- os/ports/GCC/ARMCMx/chcore_v7m.h (revision 2723) -+++ os/ports/GCC/ARMCMx/chcore_v7m.h (working copy) -@@ -36,6 +36,8 @@ - #ifndef _CHCORE_V7M_H_ - #define _CHCORE_V7M_H_ - -+#include "chdebug.h" -+ - /*===========================================================================*/ - /* Port constants. */ - /*===========================================================================*/ -@@ -486,6 +488,8 @@ - #define port_wait_for_interrupt() - #endif - -+void chDbgStackOverflowPanic(Thread *otp); -+ - /** - * @brief Performs a context switch between two threads. - * @details This is the most critical code in any port, this function -@@ -502,7 +506,7 @@ - #define port_switch(ntp, otp) { \ - register struct intctx *r13 asm ("r13"); \ - if ((stkalign_t *)(r13 - 1) < otp->p_stklimit) \ -- chDbgPanic("stack overflow"); \ -+ chDbgStackOverflowPanic(otp); \ - _port_switch(ntp, otp); \ - } - #endif -Index: os/ports/GCC/ARMCMx/rules.mk -=================================================================== ---- os/ports/GCC/ARMCMx/rules.mk (revision 2723) -+++ os/ports/GCC/ARMCMx/rules.mk (working copy) -@@ -60,7 +60,7 @@ - ASFLAGS = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.s=.lst)) $(ADEFS) - ASXFLAGS = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.S=.lst)) $(ADEFS) - CFLAGS = $(MCFLAGS) $(OPT) $(COPT) $(CWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.c=.lst)) $(DEFS) --CPPFLAGS = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.cpp=.lst)) $(DEFS) -+CPPFLAGS = $(MCFLAGS) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.cpp=.lst)) $(DEFS) - ifeq ($(USE_LINK_GC),yes) - LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--gc-sections $(LLIBDIR) - else -@@ -113,7 +113,7 @@ - $(BUILDDIR) $(OBJDIR) $(LSTDIR): - ifneq ($(USE_VERBOSE_COMPILE),yes) - @echo Compiler Options -- @echo $(CC) -c $(CFLAGS) -I. $(IINCDIR) main.c -o main.o -+ @echo $(CPPC) -c $(CPPFLAGS) -I. $(IINCDIR) main.cpp -o main.o -llibstd++ - @echo - endif - mkdir -p $(OBJDIR)