Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-02 05:17:03 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

OpenOCD moved the location of scripts. This patch fixes the defaults. (#2059)

Browse Source 
needs openocd 0.6 or higher, which should be the case on all our supported ubuntu versions
This commit is contained in:
Piotr Esden-Tempski
2017-05-13 12:19:54 -07:00
committed by Felix Ruess
parent f94fcec20c
commit d683d4b52a
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/Makefile.chibios
+2 -2
View File
@@ -343,8 +343,8 @@ GDB = $(shell which arm-none-eabi-gdb)
# Settings for OOCD
$(TARGET).OOCD_INTERFACE=flossjtag
OOCD_INTERFACE=flossjtag
$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
OOCD_INTERFACE=ftdi/flossjtag
OOCD = $(shell which openocd)
ifndef $(TARGET).OOCD_BOARD
conf/Makefile.lpc21
+1 -1
View File
@@ -157,7 +157,7 @@ LPC21IAP = $(PAPARAZZI_SRC)/sw/ground_segment/lpc21iap/lpc21iap
# ---------------------------------------------------------------------------
# Flash-Programming support using openocd
OOCD ?= openocd
OOCD_INTERFACE = arm-usb-ocd
OOCD_INTERFACE = ftdi/olimex-arm-usb-ocd
OOCD_TARGET = csc
conf/Makefile.stm32-upload
+1 -1
View File
@@ -99,7 +99,7 @@ OOCD_OPTIONS = -c "ft2232_serial $(BOARD_SERIAL)"
endif
ifndef $(TARGET).OOCD_INTERFACE
OOCD_INTERFACE = lisa-l
OOCD_INTERFACE = ftdi/lisa-l
else
OOCD_INTERFACE = $($(TARGET).OOCD_INTERFACE)
endif
conf/boards/cc3d.makefile
+1 -1
View File
@@ -11,7 +11,7 @@ BOARD_CFG=\"boards/$(BOARD).h\"
ARCH=stm32
$(TARGET).ARCHDIR = $(ARCH)
# not needed?
$(TARGET).OOCD_INTERFACE=flossjtag
$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
$(TARGET).LDSCRIPT=$(SRC_ARCH)/cc3d.ld
# -----------------------------------------------------------------------
conf/boards/cjmcu.makefile
+1 -1
View File
@@ -13,7 +13,7 @@ BOARD_CFG=\"boards/$(BOARD).h\"
ARCH=stm32
$(TARGET).ARCHDIR = $(ARCH)
# not needed?
$(TARGET).OOCD_INTERFACE=flossjtag
$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
$(TARGET).LDSCRIPT=$(SRC_ARCH)/cjmcu.ld
# -----------------------------------------------------------------------
conf/boards/krooz_sd.makefile
+2 -2
View File
@@ -16,8 +16,8 @@ ARCH_DIR=stm32
SRC_ARCH=arch/$(ARCH_DIR)
$(TARGET).ARCHDIR = $(ARCH)
# not needed?
$(TARGET).OOCD_INTERFACE=flossjtag
#$(TARGET).OOCD_INTERFACE=jtagkey-tiny
$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
#$(TARGET).OOCD_INTERFACE=ftdi/jtagkey
$(TARGET).LDSCRIPT=$(SRC_ARCH)/krooz.ld
# -----------------------------------------------------------------------
conf/boards/lia_1.1.makefile
+2 -2
View File
@@ -12,8 +12,8 @@ BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
ARCH=stm32
$(TARGET).ARCHDIR = $(ARCH)
# not needed?
$(TARGET).OOCD_INTERFACE=flossjtag
#$(TARGET).OOCD_INTERFACE=jtagkey-tiny
$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
#$(TARGET).OOCD_INTERFACE=ftdi/jtagkey
$(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-m.ld
# -----------------------------------------------------------------------
conf/boards/lisa_m_1.0.makefile
+2 -2
View File
@@ -12,8 +12,8 @@ BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
ARCH=stm32
$(TARGET).ARCHDIR = $(ARCH)
# not needed?
$(TARGET).OOCD_INTERFACE=flossjtag
#$(TARGET).OOCD_INTERFACE=jtagkey-tiny
$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
#$(TARGET).OOCD_INTERFACE=ftdi/jtagkey
$(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-m.ld
# -----------------------------------------------------------------------
conf/boards/lisa_m_common.makefile
+2 -2
View File
@@ -8,8 +8,8 @@ BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
ARCH=stm32
$(TARGET).ARCHDIR = $(ARCH)
# not needed?
$(TARGET).OOCD_INTERFACE=flossjtag
#$(TARGET).OOCD_INTERFACE=jtagkey-tiny
$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
#$(TARGET).OOCD_INTERFACE=ftdi/jtagkey
$(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-m.ld
# -----------------------------------------------------------------------
sw/airborne/arch/stm32/cjmcu.makefile
+1 -1
View File
@@ -13,7 +13,7 @@ BOARD_CFG=\"boards/$(BOARD).h\"
ARCH=stm32
$(TARGET).ARCHDIR = $(ARCH)
# not needed?
$(TARGET).OOCD_INTERFACE=flossjtag
$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
$(TARGET).LDSCRIPT=$(SRC_ARCH)/cjmcu.ld
# -----------------------------------------------------------------------