aboutsummaryrefslogtreecommitdiff
path: root/lib/stm32/f1
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2012-10-31 13:34:18 -0700
committerPiotr Esden-Tempski2012-10-31 13:34:18 -0700
commit6b2ca89f48bef80dd37fa4245a7138b7e5c36c91 (patch)
treef3d85ab83a90a8285faf677befc2a386141d165a /lib/stm32/f1
parentfd3ee124f838aedc90e591f94201b75171219b56 (diff)
parente8ec29e636ec78da27efd2a077125144039a73c5 (diff)
Merge pull request #22 fixing usb and f4 alignment issues
Merge remote-tracking branch 'jdk/master' Conflicts: lib/stm32/f1/Makefile lib/stm32/f4/Makefile
Diffstat (limited to 'lib/stm32/f1')
-rw-r--r--lib/stm32/f1/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/stm32/f1/Makefile b/lib/stm32/f1/Makefile
index 2bd5ff0..ed8ae29 100644
--- a/lib/stm32/f1/Makefile
+++ b/lib/stm32/f1/Makefile
@@ -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