mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-12-01 09:24:10 +01:00
OP-439 unified OpenOCD config for mac os x and Linux, Makefiles adapted accordingly
This commit is contained in:
parent
f0bfffda09
commit
ee7179bd53
@ -316,9 +316,13 @@ OOCD_CL=-d0
|
||||
# interface and board/target settings (using the OOCD target-library here)
|
||||
UNAME := $(shell uname)
|
||||
ifeq ($(UNAME), Darwin)
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.ahrs.osx.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.ahrs.posix.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.ahrs.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
ifeq ($(UNAME), Linux)
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.ahrs.posix.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.ahrs.win.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
endif
|
||||
endif
|
||||
# initialize
|
||||
OOCD_CL+=-c init
|
||||
|
@ -303,9 +303,13 @@ OOCD_CL=-d0
|
||||
# interface and board/target settings (using the OOCD target-library here)
|
||||
UNAME := $(shell uname)
|
||||
ifeq ($(UNAME), Darwin)
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.ahrs.osx.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.ahrs.posix.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.ahrs.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
ifeq ($(UNAME), Linux)
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.ahrs.posix.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.ahrs.win.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
endif
|
||||
endif
|
||||
# initialize
|
||||
OOCD_CL+=-c init
|
||||
|
@ -64,8 +64,8 @@ USE_THUMB_MODE = YES
|
||||
# - MODEL used for linker-script name (-T) and passed as define
|
||||
# - BOARD just passed as define (optional)
|
||||
MCU = cortex-m3
|
||||
CHIP = STM32F103CBT
|
||||
BOARD ?= NULL
|
||||
CHIP = STM32F103CBT
|
||||
BOARD ?= NULL
|
||||
MODEL ?= NULL
|
||||
|
||||
ifeq ($(USE_BOOTLOADER), YES)
|
||||
@ -343,9 +343,13 @@ OOCD_CL=-d0
|
||||
UNAME := $(shell uname)
|
||||
|
||||
ifeq ($(UNAME), Darwin)
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.osx.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
ifeq ($(UNAME), Linux)
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.win.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
endif
|
||||
endif
|
||||
# initialize
|
||||
OOCD_CL+=-c init
|
||||
|
@ -382,9 +382,13 @@ OOCD_CL=-d0
|
||||
# interface and board/target settings (using the OOCD target-library here)
|
||||
UNAME := $(shell uname)
|
||||
ifeq ($(UNAME), Darwin)
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.osx.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
ifeq ($(UNAME), Linux)
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.win.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
endif
|
||||
endif
|
||||
# initialize
|
||||
OOCD_CL+=-c init
|
||||
|
@ -383,9 +383,13 @@ OOCD_CL=-d0
|
||||
# interface and board/target settings (using the OOCD target-library here)
|
||||
UNAME := $(shell uname)
|
||||
ifeq ($(UNAME), Darwin)
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.osx.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
ifeq ($(UNAME), Linux)
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.win.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
endif
|
||||
endif
|
||||
# initialize
|
||||
OOCD_CL+=-c init
|
||||
|
@ -382,9 +382,13 @@ OOCD_CL=-d0
|
||||
# interface and board/target settings (using the OOCD target-library here)
|
||||
UNAME := $(shell uname)
|
||||
ifeq ($(UNAME), Darwin)
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.osx.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
ifeq ($(UNAME), Linux)
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../../Project/OpenOCD/floss-jtag.openpilot.win.cfg -f ../../Project/OpenOCD/stm32.cfg
|
||||
endif
|
||||
endif
|
||||
# initialize
|
||||
OOCD_CL+=-c init
|
||||
|
@ -489,9 +489,13 @@ OOCD_CL=-d0
|
||||
# interface and board/target settings (using the OOCD target-library here)
|
||||
UNAME := $(shell uname)
|
||||
ifeq ($(UNAME), Darwin)
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.osx.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
ifeq ($(UNAME), Linux)
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.win.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
endif
|
||||
endif
|
||||
# initialize
|
||||
OOCD_CL+=-c init
|
||||
|
@ -325,9 +325,13 @@ OOCD_CL=-d0
|
||||
# interface and board/target settings (using the OOCD target-library here)
|
||||
UNAME := $(shell uname)
|
||||
ifeq ($(UNAME), Darwin)
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.osx.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
ifeq ($(UNAME), Linux)
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.win.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
endif
|
||||
endif
|
||||
# initialize
|
||||
OOCD_CL+=-c init
|
||||
|
@ -471,9 +471,13 @@ OOCD_CL=-d0
|
||||
# interface and board/target settings (using the OOCD target-library here)
|
||||
UNAME := $(shell uname)
|
||||
ifeq ($(UNAME), Darwin)
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.osx.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
ifeq ($(UNAME), Linux)
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.posix.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.win.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
endif
|
||||
endif
|
||||
# initialize
|
||||
OOCD_CL+=-c init
|
||||
|
@ -361,9 +361,13 @@ OOCD_CL=-d0
|
||||
# interface and board/target settings (using the OOCD target-library here)
|
||||
UNAME := $(shell uname)
|
||||
ifeq ($(UNAME), Darwin)
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.pipxtreme.osx.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.pipxtreme.posix.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.pipxtreme.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
ifeq ($(UNAME), Linux)
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.pipxtreme.posix.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
else
|
||||
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.pipxtreme.win.cfg -f ../Project/OpenOCD/stm32.cfg
|
||||
endif
|
||||
endif
|
||||
# initialize
|
||||
OOCD_CL+=-c init
|
||||
|
Loading…
Reference in New Issue
Block a user