From c0de7a327dbb6d17318cbb368b75a7219f517c29 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Tue, 10 Sep 2013 10:08:00 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6289 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/nil/NIL-STM32F051-DISCOVERY/Makefile | 12 ---- demos/nil/NIL-STM32F303-DISCOVERY/Makefile | 12 ---- .../nil/NIL-STM32F373-STM32373C_EVAL/Makefile | 12 ---- demos/nil/NIL-STM32L152-DISCOVERY/Makefile | 14 +---- demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h | 2 +- demos/rt/RT-STM32F051-DISCOVERY/Makefile | 12 ---- demos/rt/RT-STM32F303-DISCOVERY/Makefile | 12 ---- demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile | 12 ---- demos/rt/RT-STM32F407-DISCOVERY/Makefile | 12 ---- .../ARMCMx/compilers/GCC/ld/STM32F051x8.ld | 2 +- .../ARMCMx/compilers/GCC/ld/STM32F303xC.ld | 2 +- .../ARMCMx/compilers/GCC/ld/STM32F373xC.ld | 2 +- .../ARMCMx/compilers/GCC/ld/STM32F405xG.ld | 2 +- .../ARMCMx/compilers/GCC/ld/STM32F407xG.ld | 2 +- .../ARMCMx/compilers/GCC/ld/STM32L152xB.ld | 2 +- os/hal/ports/STM32/TIMv1/st_lld.c | 57 ++++++++++++++----- os/hal/ports/STM32/TIMv1/st_lld.h | 22 ++++--- os/hal/ports/STM32L1xx/stm32_registry.h | 2 +- testhal/STM32F0xx/ADC/Makefile | 12 ---- testhal/STM32F0xx/EXT/Makefile | 12 ---- testhal/STM32F0xx/IRQ_STORM/Makefile | 12 ---- testhal/STM32F0xx/PWM-ICU/Makefile | 12 ---- testhal/STM32F0xx/SPI/Makefile | 12 ---- testhal/STM32F0xx/UART/Makefile | 12 ---- testhal/STM32F30x/ADC/Makefile | 12 ---- testhal/STM32F30x/ADC_DUAL/Makefile | 12 ---- testhal/STM32F30x/CAN/Makefile | 12 ---- testhal/STM32F30x/EXT/Makefile | 12 ---- testhal/STM32F30x/IRQ_STORM/Makefile | 12 ---- testhal/STM32F30x/PWM-ICU/Makefile | 12 ---- testhal/STM32F30x/SPI/Makefile | 12 ---- testhal/STM32F30x/UART/Makefile | 12 ---- testhal/STM32F30x/USB_CDC/Makefile | 12 ---- testhal/STM32F4xx/ADC/Makefile | 12 ---- testhal/STM32F4xx/CAN/Makefile | 12 ---- testhal/STM32F4xx/DMA_STORM/Makefile | 12 ---- testhal/STM32F4xx/EXT/Makefile | 12 ---- testhal/STM32F4xx/GPT/Makefile | 12 ---- testhal/STM32F4xx/I2C/Makefile | 12 ---- testhal/STM32F4xx/IRQ_STORM/Makefile | 12 ---- testhal/STM32F4xx/IRQ_STORM_FPU/Makefile | 12 ---- testhal/STM32F4xx/PWM-ICU/Makefile | 12 ---- testhal/STM32F4xx/RTC/Makefile | 12 ---- testhal/STM32F4xx/SDC/Makefile | 12 ---- testhal/STM32F4xx/SPI/Makefile | 12 ---- testhal/STM32F4xx/UART/Makefile | 12 ---- testhal/STM32F4xx/USB_CDC/Makefile | 12 ---- testhal/common/testbuild/Makefile | 12 ---- 48 files changed, 66 insertions(+), 487 deletions(-) diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/Makefile b/demos/nil/NIL-STM32F051-DISCOVERY/Makefile index 169329564..231dbe213 100644 --- a/demos/nil/NIL-STM32F051-DISCOVERY/Makefile +++ b/demos/nil/NIL-STM32F051-DISCOVERY/Makefile @@ -58,11 +58,6 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),) USE_EXCEPTIONS_STACKSIZE = 0x400 endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -194,12 +189,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/demos/nil/NIL-STM32F303-DISCOVERY/Makefile b/demos/nil/NIL-STM32F303-DISCOVERY/Makefile index 996b12433..bde9dffd6 100644 --- a/demos/nil/NIL-STM32F303-DISCOVERY/Makefile +++ b/demos/nil/NIL-STM32F303-DISCOVERY/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile b/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile index 22601a777..80c13cd09 100644 --- a/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile +++ b/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/demos/nil/NIL-STM32L152-DISCOVERY/Makefile b/demos/nil/NIL-STM32L152-DISCOVERY/Makefile index 7fd5af6cb..48bf96351 100644 --- a/demos/nil/NIL-STM32L152-DISCOVERY/Makefile +++ b/demos/nil/NIL-STM32L152-DISCOVERY/Makefile @@ -58,11 +58,6 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),) USE_EXCEPTIONS_STACKSIZE = 0x400 endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -85,7 +80,7 @@ include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk #include $(CHIBIOS)/test/test.mk # Define linker script file here -LDSCRIPT= $(PORTLD)/STM32F303xC.ld +LDSCRIPT= $(PORTLD)/STM32L152xB.ld # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. @@ -195,12 +190,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h b/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h index 440d43beb..7cdcfbf02 100644 --- a/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h +++ b/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h @@ -51,7 +51,7 @@ * The value one is not valid, timeouts are rounded up to * this value. */ -#define NIL_CFG_TIMEDELTA 2 +#define NIL_CFG_TIMEDELTA 0 /** * @brief Events Flags APIs. diff --git a/demos/rt/RT-STM32F051-DISCOVERY/Makefile b/demos/rt/RT-STM32F051-DISCOVERY/Makefile index 5a9d67e99..6ee0911a7 100644 --- a/demos/rt/RT-STM32F051-DISCOVERY/Makefile +++ b/demos/rt/RT-STM32F051-DISCOVERY/Makefile @@ -58,11 +58,6 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),) USE_EXCEPTIONS_STACKSIZE = 0x400 endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -194,12 +189,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/demos/rt/RT-STM32F303-DISCOVERY/Makefile b/demos/rt/RT-STM32F303-DISCOVERY/Makefile index 42f67b9e2..9071bc31e 100644 --- a/demos/rt/RT-STM32F303-DISCOVERY/Makefile +++ b/demos/rt/RT-STM32F303-DISCOVERY/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile index 41bd774a4..6d6c54232 100644 --- a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile +++ b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/demos/rt/RT-STM32F407-DISCOVERY/Makefile b/demos/rt/RT-STM32F407-DISCOVERY/Makefile index 41bd774a4..6d6c54232 100644 --- a/demos/rt/RT-STM32F407-DISCOVERY/Makefile +++ b/demos/rt/RT-STM32F407-DISCOVERY/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld index 7f0bf713b..b4dfd0850 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld +++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld @@ -19,7 +19,7 @@ */ /* - * ST32F051x8 memory setup. + * STM32F051x8 memory setup. */ MEMORY { diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F303xC.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F303xC.ld index 28a6bbe00..40608e567 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F303xC.ld +++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F303xC.ld @@ -19,7 +19,7 @@ */ /* - * ST32F303xC memory setup. + * STM32F303xC memory setup. */ MEMORY { diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F373xC.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F373xC.ld index 042d9519f..c88d8e639 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F373xC.ld +++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F373xC.ld @@ -19,7 +19,7 @@ */ /* - * ST32F373xC memory setup. + * STM32F373xC memory setup. */ MEMORY { diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F405xG.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F405xG.ld index 52ec669d6..ed26141ea 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F405xG.ld +++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F405xG.ld @@ -19,7 +19,7 @@ */ /* - * ST32F405xG memory setup. + * STM32F405xG memory setup. */ MEMORY { diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F407xG.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F407xG.ld index 3c1648384..43e0b599d 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F407xG.ld +++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F407xG.ld @@ -19,7 +19,7 @@ */ /* - * ST32F407xG memory setup. + * STM32F407xG memory setup. */ MEMORY { diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L152xB.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L152xB.ld index 5a364f30b..f3bfd2cc8 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L152xB.ld +++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L152xB.ld @@ -19,7 +19,7 @@ */ /* - * ST32L152xB memory setup. + * STM32L152xB memory setup. */ MEMORY { diff --git a/os/hal/ports/STM32/TIMv1/st_lld.c b/os/hal/ports/STM32/TIMv1/st_lld.c index 240328ff5..8e4a4e84e 100644 --- a/os/hal/ports/STM32/TIMv1/st_lld.c +++ b/os/hal/ports/STM32/TIMv1/st_lld.c @@ -26,17 +26,34 @@ #if (OSAL_ST_MODE != OSAL_ST_MODE_NONE) || defined(__DOXYGEN__) +#if OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING + /* The following checks and settings are unusually done here because the file st.h needs to not have external dependencies. In this case there would be a dependency on osal.h and mcuconf.h.*/ -#if (OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING) && !STM32_HAS_TIM2 +#if !defined(HAL_ST_USE_TIM5) + +#if !STM32_HAS_TIM2 #error "TIM2 not present in the selected device" #endif -#if (OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING) && !STM32_TIM2_IS_32BITS +#if !STM32_TIM2_IS_32BITS #error "TIM2 is not a 32 bits timer" #endif +#else /* defined(HAL_ST_USE_TIM5) */ + +#if !STM32_HAS_TIM5 +#error "TIM5 not present in the selected device" +#endif + +#if !STM32_TIM5_IS_32BITS +#error "TIM5 is not a 32 bits timer" +#endif +#endif /* defined(HAL_ST_USE_TIM5) */ + +#endif /* OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING */ + /** * @name Configuration options * @{ @@ -90,7 +107,7 @@ OSAL_IRQ_HANDLER(SysTick_Handler) { OSAL_IRQ_EPILOGUE(); } -#endif +#endif /* OSAL_ST_MODE == OSAL_ST_MODE_PERIODIC */ #if (OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING) || defined(__DOXYGEN__) /** @@ -99,11 +116,15 @@ OSAL_IRQ_HANDLER(SysTick_Handler) { * * @isr */ +#if !defined(HAL_ST_USE_TIM5) OSAL_IRQ_HANDLER(STM32_TIM2_HANDLER) { +#else +OSAL_IRQ_HANDLER(STM32_TIM5_HANDLER) { +#endif OSAL_IRQ_PROLOGUE(); - STM32_TIM2->SR = 0; + ST_TIM->SR = 0; osalSysLockFromISR(); osalOsTimerHandlerI(); @@ -111,7 +132,7 @@ OSAL_IRQ_HANDLER(STM32_TIM2_HANDLER) { OSAL_IRQ_EPILOGUE(); } -#endif +#endif /* OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING */ /*===========================================================================*/ /* Driver exported functions. */ @@ -126,21 +147,29 @@ void st_lld_init(void) { #if OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING /* Free running counter mode.*/ +#if !defined(HAL_ST_USE_TIM5) rccEnableTIM2(FALSE); +#else + rccEnableTIM5(FALSE); +#endif /* Initializing the counter in free running mode.*/ - STM32_TIM2->PSC = STM32_TIMCLK1 / OSAL_SYSTICK_FREQUENCY - 1; - STM32_TIM2->ARR = 0xFFFFFFFF; - STM32_TIM2->CCMR1 = 0; - STM32_TIM2->CCR[0] = 0; - STM32_TIM2->DIER = 0; - STM32_TIM2->CR2 = 0; - STM32_TIM2->EGR = TIM_EGR_UG; - STM32_TIM2->CR1 = TIM_CR1_CEN; + ST_TIM->PSC = STM32_TIMCLK1 / OSAL_SYSTICK_FREQUENCY - 1; + ST_TIM->ARR = 0xFFFFFFFF; + ST_TIM->CCMR1 = 0; + ST_TIM->CCR[0] = 0; + ST_TIM->DIER = 0; + ST_TIM->CR2 = 0; + ST_TIM->EGR = TIM_EGR_UG; + ST_TIM->CR1 = TIM_CR1_CEN; /* IRQ enabled.*/ +#if !defined(HAL_ST_USE_TIM5) nvicEnableVector(STM32_TIM2_NUMBER, STM32_ST_IRQ_PRIORITY); +#else + nvicEnableVector(STM32_TIM5_NUMBER, STM32_ST_IRQ_PRIORITY); #endif +#endif /* OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING */ #if OSAL_ST_MODE == OSAL_ST_MODE_PERIODIC /* Periodic systick mode, the Cortex-Mx internal systick timer is used @@ -153,7 +182,7 @@ void st_lld_init(void) { /* IRQ enabled.*/ nvicSetSystemHandlerPriority(SysTick_IRQn, STM32_ST_IRQ_PRIORITY); -#endif +#endif /* OSAL_ST_MODE == OSAL_ST_MODE_PERIODIC */ } #endif /* OSAL_ST_MODE != OSAL_ST_MODE_NONE */ diff --git a/os/hal/ports/STM32/TIMv1/st_lld.h b/os/hal/ports/STM32/TIMv1/st_lld.h index fb067f202..4a969738c 100644 --- a/os/hal/ports/STM32/TIMv1/st_lld.h +++ b/os/hal/ports/STM32/TIMv1/st_lld.h @@ -42,6 +42,12 @@ /* Derived constants and error checks. */ /*===========================================================================*/ +#if !defined(HAL_ST_USE_TIM5) +#define ST_TIM STM32_TIM2 +#else +#define ST_TIM STM32_TIM5 +#endif + /*===========================================================================*/ /* Driver data structures and types. */ /*===========================================================================*/ @@ -75,7 +81,7 @@ extern "C" { */ static inline systime_t st_lld_get_counter(void) { - return (systime_t)(STM32_TIM2->CNT); + return (systime_t)(ST_TIM->CNT); } /** @@ -89,9 +95,9 @@ static inline systime_t st_lld_get_counter(void) { */ static inline void st_lld_start_alarm(systime_t time) { - STM32_TIM2->CCR[0] = time; - STM32_TIM2->SR = 0; - STM32_TIM2->DIER = STM32_TIM_DIER_CC1IE; + ST_TIM->CCR[0] = time; + ST_TIM->SR = 0; + ST_TIM->DIER = STM32_TIM_DIER_CC1IE; } /** @@ -101,7 +107,7 @@ static inline void st_lld_start_alarm(systime_t time) { */ static inline void st_lld_stop_alarm(void) { - STM32_TIM2->DIER = 0; + ST_TIM->DIER = 0; } /** @@ -113,7 +119,7 @@ static inline void st_lld_stop_alarm(void) { */ static inline void st_lld_set_alarm(systime_t time) { - STM32_TIM2->CCR[0] = (uint32_t)time; + ST_TIM->CCR[0] = (uint32_t)time; } /** @@ -125,7 +131,7 @@ static inline void st_lld_set_alarm(systime_t time) { */ static inline systime_t st_lld_get_alarm(void) { - return (systime_t)STM32_TIM2->CCR[0]; + return (systime_t)ST_TIM->CCR[0]; } /** @@ -139,7 +145,7 @@ static inline systime_t st_lld_get_alarm(void) { */ static inline bool st_lld_is_alarm_active(void) { - return (bool)((STM32_TIM2->DIER & STM32_TIM_DIER_CC1IE) != 0); + return (bool)((ST_TIM->DIER & STM32_TIM_DIER_CC1IE) != 0); } #endif /* _ST_LLD_H_ */ diff --git a/os/hal/ports/STM32L1xx/stm32_registry.h b/os/hal/ports/STM32L1xx/stm32_registry.h index 1a6379bcd..23d5d3264 100644 --- a/os/hal/ports/STM32L1xx/stm32_registry.h +++ b/os/hal/ports/STM32L1xx/stm32_registry.h @@ -104,7 +104,7 @@ #define STM32_TIM_MAX_CHANNELS 6 #define STM32_HAS_TIM2 TRUE -#define STM32_TIM2_IS_32BITS TRUE +#define STM32_TIM2_IS_32BITS FALSE #define STM32_TIM2_CHANNELS 4 #define STM32_HAS_TIM3 TRUE diff --git a/testhal/STM32F0xx/ADC/Makefile b/testhal/STM32F0xx/ADC/Makefile index f92920214..ce8097acc 100644 --- a/testhal/STM32F0xx/ADC/Makefile +++ b/testhal/STM32F0xx/ADC/Makefile @@ -58,11 +58,6 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),) USE_EXCEPTIONS_STACKSIZE = 0x400 endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -194,12 +189,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F0xx/EXT/Makefile b/testhal/STM32F0xx/EXT/Makefile index f92920214..ce8097acc 100644 --- a/testhal/STM32F0xx/EXT/Makefile +++ b/testhal/STM32F0xx/EXT/Makefile @@ -58,11 +58,6 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),) USE_EXCEPTIONS_STACKSIZE = 0x400 endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -194,12 +189,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F0xx/IRQ_STORM/Makefile b/testhal/STM32F0xx/IRQ_STORM/Makefile index f92920214..ce8097acc 100644 --- a/testhal/STM32F0xx/IRQ_STORM/Makefile +++ b/testhal/STM32F0xx/IRQ_STORM/Makefile @@ -58,11 +58,6 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),) USE_EXCEPTIONS_STACKSIZE = 0x400 endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -194,12 +189,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F0xx/PWM-ICU/Makefile b/testhal/STM32F0xx/PWM-ICU/Makefile index f92920214..ce8097acc 100644 --- a/testhal/STM32F0xx/PWM-ICU/Makefile +++ b/testhal/STM32F0xx/PWM-ICU/Makefile @@ -58,11 +58,6 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),) USE_EXCEPTIONS_STACKSIZE = 0x400 endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -194,12 +189,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F0xx/SPI/Makefile b/testhal/STM32F0xx/SPI/Makefile index f92920214..ce8097acc 100644 --- a/testhal/STM32F0xx/SPI/Makefile +++ b/testhal/STM32F0xx/SPI/Makefile @@ -58,11 +58,6 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),) USE_EXCEPTIONS_STACKSIZE = 0x400 endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -194,12 +189,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F0xx/UART/Makefile b/testhal/STM32F0xx/UART/Makefile index f92920214..ce8097acc 100644 --- a/testhal/STM32F0xx/UART/Makefile +++ b/testhal/STM32F0xx/UART/Makefile @@ -58,11 +58,6 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),) USE_EXCEPTIONS_STACKSIZE = 0x400 endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -194,12 +189,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F30x/ADC/Makefile b/testhal/STM32F30x/ADC/Makefile index 2a00db986..8d6dae35f 100644 --- a/testhal/STM32F30x/ADC/Makefile +++ b/testhal/STM32F30x/ADC/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F30x/ADC_DUAL/Makefile b/testhal/STM32F30x/ADC_DUAL/Makefile index 2a00db986..8d6dae35f 100644 --- a/testhal/STM32F30x/ADC_DUAL/Makefile +++ b/testhal/STM32F30x/ADC_DUAL/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F30x/CAN/Makefile b/testhal/STM32F30x/CAN/Makefile index 2a00db986..8d6dae35f 100644 --- a/testhal/STM32F30x/CAN/Makefile +++ b/testhal/STM32F30x/CAN/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F30x/EXT/Makefile b/testhal/STM32F30x/EXT/Makefile index 2a00db986..8d6dae35f 100644 --- a/testhal/STM32F30x/EXT/Makefile +++ b/testhal/STM32F30x/EXT/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F30x/IRQ_STORM/Makefile b/testhal/STM32F30x/IRQ_STORM/Makefile index 2a00db986..8d6dae35f 100644 --- a/testhal/STM32F30x/IRQ_STORM/Makefile +++ b/testhal/STM32F30x/IRQ_STORM/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F30x/PWM-ICU/Makefile b/testhal/STM32F30x/PWM-ICU/Makefile index 2a00db986..8d6dae35f 100644 --- a/testhal/STM32F30x/PWM-ICU/Makefile +++ b/testhal/STM32F30x/PWM-ICU/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F30x/SPI/Makefile b/testhal/STM32F30x/SPI/Makefile index 2a00db986..8d6dae35f 100644 --- a/testhal/STM32F30x/SPI/Makefile +++ b/testhal/STM32F30x/SPI/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F30x/UART/Makefile b/testhal/STM32F30x/UART/Makefile index 2a00db986..8d6dae35f 100644 --- a/testhal/STM32F30x/UART/Makefile +++ b/testhal/STM32F30x/UART/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F30x/USB_CDC/Makefile b/testhal/STM32F30x/USB_CDC/Makefile index 8021ce8e4..31217602a 100644 --- a/testhal/STM32F30x/USB_CDC/Makefile +++ b/testhal/STM32F30x/USB_CDC/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -201,12 +196,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/ADC/Makefile b/testhal/STM32F4xx/ADC/Makefile index 9c557ab43..679fe0eb7 100644 --- a/testhal/STM32F4xx/ADC/Makefile +++ b/testhal/STM32F4xx/ADC/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/CAN/Makefile b/testhal/STM32F4xx/CAN/Makefile index 9c557ab43..679fe0eb7 100644 --- a/testhal/STM32F4xx/CAN/Makefile +++ b/testhal/STM32F4xx/CAN/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/DMA_STORM/Makefile b/testhal/STM32F4xx/DMA_STORM/Makefile index 9c557ab43..679fe0eb7 100644 --- a/testhal/STM32F4xx/DMA_STORM/Makefile +++ b/testhal/STM32F4xx/DMA_STORM/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/EXT/Makefile b/testhal/STM32F4xx/EXT/Makefile index 9c557ab43..679fe0eb7 100644 --- a/testhal/STM32F4xx/EXT/Makefile +++ b/testhal/STM32F4xx/EXT/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/GPT/Makefile b/testhal/STM32F4xx/GPT/Makefile index 9c557ab43..679fe0eb7 100644 --- a/testhal/STM32F4xx/GPT/Makefile +++ b/testhal/STM32F4xx/GPT/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/I2C/Makefile b/testhal/STM32F4xx/I2C/Makefile index b23aa7b82..ea0986ffe 100644 --- a/testhal/STM32F4xx/I2C/Makefile +++ b/testhal/STM32F4xx/I2C/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/IRQ_STORM/Makefile b/testhal/STM32F4xx/IRQ_STORM/Makefile index 9c557ab43..679fe0eb7 100644 --- a/testhal/STM32F4xx/IRQ_STORM/Makefile +++ b/testhal/STM32F4xx/IRQ_STORM/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/Makefile b/testhal/STM32F4xx/IRQ_STORM_FPU/Makefile index 92e081a19..fab535b0d 100644 --- a/testhal/STM32F4xx/IRQ_STORM_FPU/Makefile +++ b/testhal/STM32F4xx/IRQ_STORM_FPU/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = yes endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/PWM-ICU/Makefile b/testhal/STM32F4xx/PWM-ICU/Makefile index 9c557ab43..679fe0eb7 100644 --- a/testhal/STM32F4xx/PWM-ICU/Makefile +++ b/testhal/STM32F4xx/PWM-ICU/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/RTC/Makefile b/testhal/STM32F4xx/RTC/Makefile index 07080c146..73f8b39bc 100644 --- a/testhal/STM32F4xx/RTC/Makefile +++ b/testhal/STM32F4xx/RTC/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -204,12 +199,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/SDC/Makefile b/testhal/STM32F4xx/SDC/Makefile index 45bc2df8c..c4614fda1 100644 --- a/testhal/STM32F4xx/SDC/Makefile +++ b/testhal/STM32F4xx/SDC/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -205,12 +200,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/SPI/Makefile b/testhal/STM32F4xx/SPI/Makefile index 9c557ab43..679fe0eb7 100644 --- a/testhal/STM32F4xx/SPI/Makefile +++ b/testhal/STM32F4xx/SPI/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/UART/Makefile b/testhal/STM32F4xx/UART/Makefile index 9c557ab43..679fe0eb7 100644 --- a/testhal/STM32F4xx/UART/Makefile +++ b/testhal/STM32F4xx/UART/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -199,12 +194,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/STM32F4xx/USB_CDC/Makefile b/testhal/STM32F4xx/USB_CDC/Makefile index 4b6c7c493..316c6530c 100644 --- a/testhal/STM32F4xx/USB_CDC/Makefile +++ b/testhal/STM32F4xx/USB_CDC/Makefile @@ -63,11 +63,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -201,12 +196,5 @@ ULIBS = # End of user defines ############################################################################## -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/common/testbuild/Makefile b/testhal/common/testbuild/Makefile index c6b46622b..adc77ed5b 100644 --- a/testhal/common/testbuild/Makefile +++ b/testhal/common/testbuild/Makefile @@ -52,11 +52,6 @@ ifeq ($(USE_FPU),) USE_FPU = no endif -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - # # Architecture or project specific options ############################################################################## @@ -217,11 +212,4 @@ else DDEFS += -DCORTEX_USE_FPU=FALSE endif -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk