From 5b8953124e8c00cdf05169de6e304834cefacf63 Mon Sep 17 00:00:00 2001 From: Ken Sarkies Date: Sat, 9 Mar 2013 14:39:01 +1030 Subject: This mainly moves the STM32 timers' code to the common area. F2 and F4 have a common section to deal with the options register (TIM2 and TIM5 only) L1 has been made common with timer_common_all as its options register has very different settings to F2/F4. Code is in the L1/timer.c L1/timer.h files Note that F3 and F05 timers should fit into this scheme, with F3 having additional features. Bundled with this is L1/pwr.h to change a documentation setting Also all the Doxyfiles have added "ENABLE_PREPROCESSING = NO" to fix a problem introduced by commit 118. --- lib/stm32/f4/Makefile | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'lib/stm32/f4/Makefile') diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile index a6a87d6..b1cd38f 100644 --- a/lib/stm32/f4/Makefile +++ b/lib/stm32/f4/Makefile @@ -19,8 +19,8 @@ LIBNAME = libopencm3_stm32f4 -PREFIX ?= arm-none-eabi -# PREFIX ?= arm-elf +PREFIX ?= arm-none-eabi +# PREFIX ?= arm-elf CC = $(PREFIX)-gcc AR = $(PREFIX)-ar CFLAGS = -Os -g \ @@ -33,16 +33,17 @@ CFLAGS = -Os -g \ -ffunction-sections -fdata-sections -MD -DSTM32F4 # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = rcc.o gpio.o flash.o exti2.o pwr.o timer.o \ - usb.o usb_standard.o usb_control.o usb_fx07_common.o usb_f107.o \ - usb_f207.o adc.o dma.o \ - pwr_common_all.o \ - gpio_common_all.o gpio_common_f24.o dma_common_f24.o spi_common_all.o \ - dac_common_all.o usart_common_all.o iwdg_common_all.o i2c_common_all.o \ - crc_common_all.o \ - rtc_common_bcd.o \ - rtc.o \ - can.o + +OBJS = adc.o can.o gpio.o exti2.o flash.o pwr.o rcc.o + +OBJS += crc_common_all.o dac_common_all.o dma_common_f24.o \ + gpio_common_all.o gpio_common_f24.o i2c_common_all.o \ + iwdg_common_all.o pwr_common_all.o rtc_common_bcd.o \ + spi_common_all.o timer_common_all.o timer_common_f24.o \ + usart_common_all.o + +OBJS += usb.o usb_standard.o usb_control.o usb_fx07_common.o \ + usb_f107.o usb_f207.o VPATH += ../../usb:../:../../cm3:../common -- cgit v1.2.3