aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFergus Noble2011-09-15 15:06:28 -0700
committerStephen Caudle2011-10-12 22:17:16 -0400
commit72baa300ab82c184e156e170cae0dcd1fd665d12 (patch)
tree0eca6bccbc2bbcfac0dcb78e71a31dccd444ca2b /lib
parentca412a9ed2ab3bf5f4bdf54b7b300290931ab39b (diff)
Moved I2C to stm32 common.
Diffstat (limited to 'lib')
-rw-r--r--lib/stm32_common/i2c.c (renamed from lib/stm32f1/i2c.c)0
-rw-r--r--lib/stm32f2/Makefile2
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/stm32f1/i2c.c b/lib/stm32_common/i2c.c
index e1a3b84..e1a3b84 100644
--- a/lib/stm32f1/i2c.c
+++ b/lib/stm32_common/i2c.c
diff --git a/lib/stm32f2/Makefile b/lib/stm32f2/Makefile
index d52525b..f3d6ff7 100644
--- a/lib/stm32f2/Makefile
+++ b/lib/stm32f2/Makefile
@@ -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
+OBJS = vector.o gpio.o systick.o i2c.o
#VPATH += ../usb
VPATH += ../stm32_common