[paparazzi-commits] [4690]

[antoine drouin]

Revision: 4690
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4690
Author:   poine
Date:     2010-03-15 15:41:25 +0000 (Mon, 15 Mar 2010)
Log Message:
-----------


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

Modified: paparazzi3/trunk/conf/Makefile.stm32
===================================================================
--- paparazzi3/trunk/conf/Makefile.stm32        2010-03-15 15:41:05 UTC (rev 
4689)
+++ paparazzi3/trunk/conf/Makefile.stm32        2010-03-15 15:41:25 UTC (rev 
4690)
@@ -52,7 +52,8 @@
 
 LOADER=$(STM32_DIR)/stm32loader-a3c51c26ad6c/stm32loader.py
 
-OOCD_INTERFACE = arm-usb-ocd
+#OOCD_INTERFACE = arm-usb-ocd
+OOCD_INTERFACE = openocd-usb2
 OOCD_TARGET    = olimex_stm32_h103
 
 # inpput files
@@ -64,7 +65,7 @@
 AOBJ    = $(ASRC:%.S=$(OBJDIR)/%.o)
 
 # linker script
-LD_SCRIPT = $(SRC_FYA)/stm32f10x_flash_md.ld
+LD_SCRIPT = $(SRC_LISA)/stm32f10x_flash_md.ld
 
 CFLAGS = -I. -I./$(ARCHI) $(INCLUDES) -Wall -ansi -std=c99 -c -fno-common -Os 
-g -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -c
 CFLAGS += -Wl,gc-sections