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

Merge pull request #22 fixing usb and f4 alignment issues

Browse Source 
Merge remote-tracking branch 'jdk/master'

Conflicts:
	lib/stm32/f1/Makefile
	lib/stm32/f4/Makefile
This commit is contained in:
Piotr Esden-Tempski
2012-10-31 13:34:18 -07:00
parent fd3ee124f8 e8ec29e636
commit 6b2ca89f48
30 changed files with 1502 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/stm32/f1/Makefile
View File

@@ -31,7 +31,8 @@ ARFLAGS = rcs
OBJS = rcc.o gpio.o usart.o adc.o spi.o flash.o \
rtc.o i2c.o dma.o exti.o ethernet.o \
usb_f103.o usb.o usb_control.o usb_standard.o can.o \
timer.o usb_f107.o desig.o crc.o dac.o iwdg.o pwr.o
timer.o usb_f107.o desig.o crc.o dac.o iwdg.o pwr.o \
usb_fx07_common.o
VPATH += ../../usb:../:../../cm3