summaryrefslogtreecommitdiffstats
path: root/Makefile.include
diff options
context:
space:
mode:
authorroot <root@lab2.panaceas.james.local>2014-11-02 18:17:44 +0000
committerroot <root@lab2.panaceas.james.local>2014-11-02 18:17:44 +0000
commit12287ff0a55f929bf840dcb4780d3f77b862c434 (patch)
tree46632674f393249e7cd74eacd7a4da00ccec540f /Makefile.include
parent479e719a64d75374f00438498cf91ba2601a63f1 (diff)
downloadstm32_usb_kvm-12287ff0a55f929bf840dcb4780d3f77b862c434.tar.gz
stm32_usb_kvm-12287ff0a55f929bf840dcb4780d3f77b862c434.tar.bz2
stm32_usb_kvm-12287ff0a55f929bf840dcb4780d3f77b862c434.zip
fish
Diffstat (limited to 'Makefile.include')
-rw-r--r--Makefile.include10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.include b/Makefile.include
index adfecf6..3eccc25 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -27,9 +27,13 @@ ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd
################################################################################
# OpenOCD specific variables
-OOCD ?= openocd
-OOCD_INTERFACE ?= flossjtag
-OOCD_BOARD ?= olimex_stm32_h103
+#OOCD ?= openocd
+#OOCD_INTERFACE ?= flossjtag
+#OOCD_BOARD ?= olimex_stm32_h103
+
+OOCD ?= openocd
+OOCD_INTERFACE ?= ../interface/j-link.cfg
+OOCD_BOARD ?= ../board/STM32F103R_BOARD.cfg
################################################################################
# Black Magic Probe specific variables