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

make flash: overhaul openocd configuration

Browse Source 
Instead of OOCD_SERIAL triggering an attempt to use a specific ftdi based
adapter, introduce common target/interface pairs, OOCD_INTERFACE and
OOCD_TARGET, and an override via OOCD_FILE allowing full control.

Further, attempt to connect to a running openocd instance to flash if possible.
This _will not_ work well if you have multiple openocd instances open at once,
but that's a rare use case.

Examples:
OOCD_INTERFACE=stlink-v2
OOCD_TARGET=stm32f0x
 --> openocd ... -f interface/stlink-v2.cfg -f target/stm32f0x.cfg)

OOCD_FILE=board/ek-lm4f120xl.cfg
 --> openocd ... -f $(OOCD_FILE)  (ie, the variable is passed untouched)

As part of implementing this, correct variables that were always wrong, and
update the openocd flashing commands to use current commands.
This commit is contained in:
Karl Palsson
2016-04-18 01:14:19 +00:00
parent b227e1609c
commit bcd7d57c11
20 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/stm32/f0/Makefile.include
View File

@@ -28,8 +28,8 @@ ARCH_FLAGS = -mthumb -mcpu=cortex-m0 $(FP_FLAGS)
# OpenOCD specific variables
OOCD ?= openocd
OOCD_INTERFACE ?= flossjtag
OOCD_BOARD ?= olimex_stm32_h103
OOCD_INTERFACE ?= stlink-v2-1
OOCD_TARGET ?= stm32f0x
################################################################################
# Black Magic Probe specific variables

2
examples/stm32/f1/Makefile.include
View File

@@ -29,7 +29,7 @@ ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd
OOCD ?= openocd
OOCD_INTERFACE ?= flossjtag
OOCD_BOARD ?= olimex_stm32_h103
OOCD_TARGET ?= stm32f1x
################################################################################
# Black Magic Probe specific variables

2
examples/stm32/f1/obldc/usart_irq/Makefile
View File

@@ -19,7 +19,7 @@
BINARY = usart_irq
OOCD_BOARD = open-bldc
OOCD_FILE = board/open-bldc.cfg
LDSCRIPT = ../obldc.ld

2
examples/stm32/f2/Makefile.include
View File

@@ -31,7 +31,7 @@ ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd
OOCD ?= openocd
OOCD_INTERFACE ?= flossjtag
OOCD_BOARD ?= olimex_stm32_h103
OOCD_TARGET ?= stm32f2x
################################################################################
# Black Magic Probe specific variables

2
examples/stm32/f3/Makefile.include
View File

@@ -30,7 +30,7 @@ ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS)
OOCD ?= openocd
OOCD_INTERFACE ?= stlink-v2
OOCD_BOARD ?= stm32f3discovery
OOCD_TARGET ?= stm32f3x
################################################################################
# Black Magic Probe specific variables

2
examples/stm32/f4/Makefile.include
View File

@@ -33,7 +33,7 @@ endif
OOCD ?= openocd
OOCD_INTERFACE ?= stlink-v2
OOCD_BOARD ?= stm32f4discovery
OOCD_TARGET ?= stm32f4x
################################################################################
# Black Magic Probe specific variables

2
examples/stm32/l0/Makefile.include
View File

@@ -29,7 +29,7 @@ ARCH_FLAGS = -mthumb -mcpu=cortex-m0plus $(FP_FLAGS)
OOCD ?= openocd
OOCD_INTERFACE ?= stlink-v2-1
OOCD_BOARD ?= stm32l0discovery
OOCD_TARGET ?= stm32l0
################################################################################
# Black Magic Probe specific variables

2
examples/stm32/l1/Makefile.include
View File

@@ -29,7 +29,7 @@ ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd
OOCD ?= openocd
OOCD_INTERFACE ?= stlink-v2
OOCD_BOARD ?= stm32ldiscovery
OOCD_TARGET ?= stm32l1
################################################################################
# Black Magic Probe specific variables