aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFergus Noble2011-09-15 14:59:55 -0700
committerStephen Caudle2011-10-12 22:17:16 -0400
commitca412a9ed2ab3bf5f4bdf54b7b300290931ab39b (patch)
tree1c712e150b462a846e587945a17e6757f513ff82 /lib
parentcadbc0145bf2eb407f24987620636f4e52b293d4 (diff)
Move systick to stm32 common.
Diffstat (limited to 'lib')
-rw-r--r--lib/stm32_common/systick.c (renamed from lib/stm32f1/systick.c)2
-rw-r--r--lib/stm32f1/Makefile2
-rw-r--r--lib/stm32f2/Makefile3
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/stm32f1/systick.c b/lib/stm32_common/systick.c
index 3308413..882601d 100644
--- a/lib/stm32f1/systick.c
+++ b/lib/stm32_common/systick.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <libopencm3/stm32/f1/systick.h>
+#include <libopencm3/stm32/systick.h>
void systick_set_reload(u32 value)
{
diff --git a/lib/stm32f1/Makefile b/lib/stm32f1/Makefile
index fa4dad1..bd9fca2 100644
--- a/lib/stm32f1/Makefile
+++ b/lib/stm32f1/Makefile
@@ -33,7 +33,7 @@ OBJS = vector.o rcc.o gpio.o usart.o adc.o spi.o flash.o nvic.o \
usb_f103.o usb.o usb_control.o usb_standard.o can.o \
timer.o usb_f107.o
-VPATH += ../usb
+VPATH += ../usb:../stm32_common
# Be silent per default, but 'make V=1' will show all compiler calls.
ifneq ($(V),1)
diff --git a/lib/stm32f2/Makefile b/lib/stm32f2/Makefile
index 1f08089..d52525b 100644
--- a/lib/stm32f2/Makefile
+++ b/lib/stm32f2/Makefile
@@ -28,9 +28,10 @@ CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \
-ffunction-sections -fdata-sections -MD -DSTM32F2
# ARFLAGS = rcsv
ARFLAGS = rcs
-OBJS = vector.o gpio.o
+OBJS = vector.o gpio.o systick.o
#VPATH += ../usb
+VPATH += ../stm32_common
# Be silent per default, but 'make V=1' will show all compiler calls.
ifneq ($(V),1)