rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

OP-439 unified OpenOCD config for mac os x and Linux, Makefiles adapted accordingly

Browse Source
This commit is contained in:
Corvus Corax 2011-04-24 12:10:33 +02:00
parent f0bfffda09
commit ee7179bd53
16 changed files with 62 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flight/AHRS/Makefile
View File

@ -316,9 +316,13 @@ OOCD_CL=-d0
# interface and board/target settings (using the OOCD target-library here) # interface and board/target settings (using the OOCD target-library here)
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Darwin) 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 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 endif
# initialize # initialize
OOCD_CL+=-c init OOCD_CL+=-c init

8
flight/Bootloaders/AHRS/Makefile
View File

@ -303,9 +303,13 @@ OOCD_CL=-d0
# interface and board/target settings (using the OOCD target-library here) # interface and board/target settings (using the OOCD target-library here)
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Darwin) 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 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 endif
# initialize # initialize
OOCD_CL+=-c init OOCD_CL+=-c init

12
flight/Bootloaders/BootloaderUpdater/Makefile
View File

@ -64,8 +64,8 @@ USE_THUMB_MODE = YES
# - MODEL used for linker-script name (-T) and passed as define # - MODEL used for linker-script name (-T) and passed as define
# - BOARD just passed as define (optional) # - BOARD just passed as define (optional)
MCU = cortex-m3 MCU = cortex-m3
CHIP = STM32F103CBT CHIP = STM32F103CBT
BOARD ?= NULL BOARD ?= NULL
MODEL ?= NULL MODEL ?= NULL
ifeq ($(USE_BOOTLOADER), YES) ifeq ($(USE_BOOTLOADER), YES)
@ -343,9 +343,13 @@ OOCD_CL=-d0
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Darwin) 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 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 endif
# initialize # initialize
OOCD_CL+=-c init OOCD_CL+=-c init

8
flight/Bootloaders/CopterControl/Makefile
View File

@ -382,9 +382,13 @@ OOCD_CL=-d0
# interface and board/target settings (using the OOCD target-library here) # interface and board/target settings (using the OOCD target-library here)
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Darwin) 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 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 endif
# initialize # initialize
OOCD_CL+=-c init OOCD_CL+=-c init

8
flight/Bootloaders/OpenPilot/Makefile
View File

@ -383,9 +383,13 @@ OOCD_CL=-d0
# interface and board/target settings (using the OOCD target-library here) # interface and board/target settings (using the OOCD target-library here)
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Darwin) 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 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 endif
# initialize # initialize
OOCD_CL+=-c init OOCD_CL+=-c init

8
flight/Bootloaders/PipXtreme/Makefile
View File

@ -382,9 +382,13 @@ OOCD_CL=-d0
# interface and board/target settings (using the OOCD target-library here) # interface and board/target settings (using the OOCD target-library here)
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Darwin) 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 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 endif
# initialize # initialize
OOCD_CL+=-c init OOCD_CL+=-c init

8
flight/CopterControl/Makefile
View File

@ -489,9 +489,13 @@ OOCD_CL=-d0
# interface and board/target settings (using the OOCD target-library here) # interface and board/target settings (using the OOCD target-library here)
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Darwin) 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 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 endif
# initialize # initialize
OOCD_CL+=-c init OOCD_CL+=-c init

8
flight/INS/Makefile
View File

@ -325,9 +325,13 @@ OOCD_CL=-d0
# interface and board/target settings (using the OOCD target-library here) # interface and board/target settings (using the OOCD target-library here)
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Darwin) 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 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 endif
# initialize # initialize
OOCD_CL+=-c init OOCD_CL+=-c init

8
flight/OpenPilot/Makefile
View File

@ -471,9 +471,13 @@ OOCD_CL=-d0
# interface and board/target settings (using the OOCD target-library here) # interface and board/target settings (using the OOCD target-library here)
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Darwin) 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 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 endif
# initialize # initialize
OOCD_CL+=-c init OOCD_CL+=-c init

8
flight/PipXtreme/Makefile
View File

@ -361,9 +361,13 @@ OOCD_CL=-d0
# interface and board/target settings (using the OOCD target-library here) # interface and board/target settings (using the OOCD target-library here)
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Darwin) 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 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 endif
# initialize # initialize
OOCD_CL+=-c init OOCD_CL+=-c init

0
flight/Project/OpenOCD/floss-jtag.ahrs.osx.cfg → flight/Project/OpenOCD/floss-jtag.ahrs.posix.cfg
View File

0
flight/Project/OpenOCD/floss-jtag.ahrs.cfg → flight/Project/OpenOCD/floss-jtag.ahrs.win.cfg
View File

0
flight/Project/OpenOCD/floss-jtag.openpilot.osx.cfg → flight/Project/OpenOCD/floss-jtag.openpilot.posix.cfg
View File

0
flight/Project/OpenOCD/floss-jtag.openpilot.cfg → flight/Project/OpenOCD/floss-jtag.openpilot.win.cfg
View File

0
flight/Project/OpenOCD/floss-jtag.pipxtreme.osx.cfg → flight/Project/OpenOCD/floss-jtag.pipxtreme.posix.cfg
View File

0
flight/Project/OpenOCD/floss-jtag.pipxtreme.cfg → flight/Project/OpenOCD/floss-jtag.pipxtreme.win.cfg
View File