Merge from trunk.

[bertos.git] / bertos / cpu / arm / info / at91sam7.common

diff --git a/bertos/cpu/arm/info/at91sam7.common b/bertos/cpu/arm/info/at91sam7.common
index 942d84e9a500f141b217930afd2bb2bdd7e41731..00f3277b9330ea70901268f6df5b129d7c469ba3 100644 (file)
--- a/bertos/cpu/arm/info/at91sam7.common
+++ b/bertos/cpu/arm/info/at91sam7.common
@@ -69,17 +69,18 @@ CPU_TAGS = ["at91", CORE_CPU]
 # Where are locate the bertos directories
 SCRIPT_DIR = CPU_DIR + "arm/scripts/"
 HW_DIR = CPU_DIR + "arm/hw/"
-PROG_SCRIPT_DIR = "prog_scripts/arm/"
 
-MK_FLASH_SCRIPT = PROG_SCRIPT_DIR + "flash.sh"
-MK_DEBUG_SCRIPT = PROG_SCRIPT_DIR + "debug.sh"
-MK_GDB_INIT_SCRIPT = PROG_SCRIPT_DIR + "openocd/gdbinit-sam7"
+MK_FLASH_SCRIPT = PRG_SCRIPTS_DIR + "arm/flash.sh"
+MK_STOPFLASH_SCRIPT = PRG_SCRIPTS_DIR + "arm/stopopenocd.sh"
+MK_DEBUG_SCRIPT = PRG_SCRIPTS_DIR + "arm/debug.sh"
+MK_STOPDEBUG_SCRIPT = PRG_SCRIPTS_DIR + "arm/stopopenocd.sh"
+
+GDB_INIT_SCRIPT = PRG_SCRIPTS_DIR + "arm/openocd/gdbinit-sam7"
 
 # Common GCC flags.
-MK_CPPAFLAGS = "-O0 -g -gdwarf-2 -g -gen-debug"
+MK_CPU_CPPAFLAGS = "-g -gdwarf-2"
 MK_CPU_CPPFLAGS = "-O0 -g3 -gdwarf-2 -fverbose-asm -I" + CPU_DIR + "arm/"
-MK_LDFLAGS = "-nostartfiles -Wl,--no-warn-mismatch"
+MK_CPU_LDFLAGS = "-nostartfiles -Wl,--no-warn-mismatch"
 
 # CRT file.
-MK_CPPASRC = [ HW_DIR + "crtat91sam7_rom.S"]
-
+MK_CPU_CPPASRC = HW_DIR + "crtat91sam7_rom.S"