[paparazzi-commits] [5241] updated openocd parameters to match paparazzi-stm32 debian package config files

[antoine drouin]

Revision: 5241
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5241
Author:   poine
Date:     2010-08-05 21:34:56 +0000 (Thu, 05 Aug 2010)
Log Message:
-----------
updated openocd parameters to match paparazzi-stm32 debian package config files

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

Modified: paparazzi3/trunk/conf/Makefile.stm32
===================================================================
--- paparazzi3/trunk/conf/Makefile.stm32        2010-08-05 19:47:38 UTC (rev 
5240)
+++ paparazzi3/trunk/conf/Makefile.stm32        2010-08-05 21:34:56 UTC (rev 
5241)
@@ -32,10 +32,10 @@
 MCU   = cortex-m3
 #DEBUG = dwarf-2
 OPT   = s
+#OPT   = 3
 
 # Programs location
 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
 
@@ -53,12 +53,12 @@
 
LOADER=/home/poine/home_regis/work/stm32/stm32loader-a3c51c26ad6c/stm32loader.py
 
 ifndef $(TARGET).OOCD_INTERFACE
-OOCD_INTERFACE = openocd-lisa-jtag
+OOCD_INTERFACE = lisa-l
 else
 OOCD_INTERFACE =  $($(TARGET).OOCD_INTERFACE)
 endif
 
-OOCD_TARGET    = stm32
+OOCD_BOARD     = lisa-l
 
 # inpput files
 SRCS = $($(TARGET).srcs)
@@ -70,8 +70,8 @@
 
 # linker script : 
 #   if LDSCRIPT is defined in the airframe use that independantly of TARGET
-#   if not and a TARGET.LDSCRIPT is defined, use that
-#   if not use the default STM32f103re_flash.ld
+#   if not, and a TARGET.LDSCRIPT is defined, use that
+#   if not, use the default STM32f103re_flash.ld
 ifndef LDSCRIPT
 ifndef $(TARGET).LDSCRIPT
 LDSCRIPT = $(SRC_ARCH)/stm32f103re_flash.ld
@@ -85,7 +85,7 @@
 CFLAGS += -mcpu=$(MCU) -mthumb -ansi
 CFLAGS += -std=gnu99
 #CFLAGS += -malignment-traps
-CFLAGS += -fno-common -O$(OPT) -g$(DEBUG)
+CFLAGS += -fno-common  -g$(DEBUG)
 CFLAGS += -ffunction-sections -fdata-sections
 CFLAGS += -Wall -Wimplicit
 CFLAGS += -Wcast-align
@@ -184,7 +184,7 @@
 upload:  $(OBJDIR)/$(TARGET).bin
        @echo -e "  OOCD\t$<"
        $(Q)$(OOCD) -f interface/$(OOCD_INTERFACE).cfg \
-                -f target/$(OOCD_TARGET).cfg \
+                -f boards/$(OOCD_BOARD).cfg \
                 -c init \
                 -c "reset halt" \
                 -c "flash write_image erase $(OBJDIR)/$(TARGET).bin 
0x08000000" \
@@ -195,7 +195,7 @@
 
 start_gdb:
        xterm -e "$(OOCD) -f interface/$(OOCD_INTERFACE).cfg  -f 
target/$(OOCD_TARGET).cfg" &
-       xterm -e "/opt/paparazzi/stm32/bin/openocd -f 
interface/openocd-lisa-jtag.cfg -f target/stm32.cfg"&
+       xterm -e "/opt/paparazzi/stm32/bin/openocd -f interface/lisa-l.cfg -f 
boards/lisa-l.cfg"&
 
 start_telnet:
        xterm -e "telnet localhost 4444" &