EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'fnoble/stm32f2' into stm32fx

Browse Source 
Conflicts:
	lib/stm32f2/Makefile
This commit is contained in:
Stephen Caudle
2011-10-27 23:39:16 -04:00
parent 36cff03af1 28d614757e
commit fd2524beb0
9 changed files with 277 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/stm32f2/Makefile
View File

@@ -28,7 +28,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \
-ffunction-sections -fdata-sections -MD -DSTM32F2
# ARFLAGS = rcsv
ARFLAGS = rcs
OBJS = vector.o gpio.o systick.o i2c.o spi.o nvic.o usart.o rcc.o flash.o
OBJS = vector.o gpio.o systick.o i2c.o spi.o nvic.o usart.o exti.o rcc.o flash.o
#VPATH += ../usb
VPATH += ../stm32_common