[paparazzi-commits] [4737] changed location of toolchain

[antoine drouin]

Revision: 4737
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4737
Author:   poine
Date:     2010-03-26 04:17:30 +0000 (Fri, 26 Mar 2010)
Log Message:
-----------
changed location of toolchain

Modified Paths:
--------------
    paparazzi3/trunk/conf/Makefile.stm32

Modified: paparazzi3/trunk/conf/Makefile.stm32
===================================================================
--- paparazzi3/trunk/conf/Makefile.stm32        2010-03-26 01:57:50 UTC (rev 
4736)
+++ paparazzi3/trunk/conf/Makefile.stm32        2010-03-26 04:17:30 UTC (rev 
4737)
@@ -34,10 +34,10 @@
 OPT   = s
 
 # Programs location
-GCC_DIR=/opt/paparazzi/stm32/arm-none-eabi/
-#GCC_DIR=/home/poine/arm-none-eabi
-GCC_BIN_DIR=$(GCC_DIR)/bin
-GCC_LIB_DIR=$(GCC_DIR)/arm-none-eabi/lib
+TOOLCHAIN_DIR=/opt/paparazzi/stm32
+#GCC_DIR=/opt/stm32/toolchain/arm-none-eabi
+GCC_BIN_DIR=$(TOOLCHAIN_DIR)/bin
+GCC_LIB_DIR=$(TOOLCHAIN_DIR)/arm-none-eabi/lib
 
 # Define programs and commands.
 GCC_BIN_PREFIX=$(GCC_BIN_DIR)/arm-none-eabi
@@ -48,12 +48,11 @@
 NM   = $(GCC_BIN_PREFIX)-nm
 SIZE = $(GCC_BIN_PREFIX)-size
 RM   = rm
-OOCD = openocd
+OOCD = $(TOOLCHAIN_DIR)/bin/openocd
 
 LOADER=$(STM32_DIR)/stm32loader-a3c51c26ad6c/stm32loader.py
 
-#OOCD_INTERFACE = arm-usb-ocd
-OOCD_INTERFACE = openocd-usb2
+OOCD_INTERFACE = openocd-lisa-jtag
 OOCD_TARGET    = olimex_stm32_h103
 
 # inpput files