lm3s: flash and debug script refactoring.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3569 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/cortex-m3/info/LM3S1968.cdef b/bertos/cpu/cortex-m3/info/LM3S1968.cdef
index c3019c43794e952e9fd2b4587b297900c355c246..494042ccc5acc3926c3c72fd73088d8d6698a515 100644 (file)
--- a/bertos/cpu/cortex-m3/info/LM3S1968.cdef
+++ b/bertos/cpu/cortex-m3/info/LM3S1968.cdef
@@ -44,7 +44,7 @@
 include("cm3.common")
 
 # CPU type used for flashing/debugging
-MK_PROGRAMMER_CPU = "lm3s1968"
+MK_PROGRAMMER_CPU = "lm3s"
 
 # CPU default clock frequency
 CPU_DEFAULT_FREQ = "50000000UL"

diff --git a/bertos/cpu/cortex-m3/info/LM3S8962.cdef b/bertos/cpu/cortex-m3/info/LM3S8962.cdef
index f67e7c2aa047f2b4e11dee87134b35d241bc4992..3491c728d21371611563141682d8d1f098a42c16 100644 (file)
--- a/bertos/cpu/cortex-m3/info/LM3S8962.cdef
+++ b/bertos/cpu/cortex-m3/info/LM3S8962.cdef
@@ -44,7 +44,7 @@
 include("cm3.common")
 
 # CPU type used for flashing/debugging
-MK_PROGRAMMER_CPU = "lm3s1968"
+MK_PROGRAMMER_CPU = "lm3s"
 
 # CPU default clock frequency
 CPU_DEFAULT_FREQ = "50000000UL"

diff --git a/bertos/cpu/cortex-m3/info/cm3.common b/bertos/cpu/cortex-m3/info/cm3.common
index f7f078af607cd993749b8eb4d22d432e15bcdd22..881bf0b1a3b7d022d6a803b77449e7cff13eaf58 100644 (file)
--- a/bertos/cpu/cortex-m3/info/cm3.common
+++ b/bertos/cpu/cortex-m3/info/cm3.common
@@ -67,7 +67,7 @@ DRV_DIR = CPU_DIR + "cortex-m3/drv/"
 
 MK_FLASH_SCRIPT = PRG_SCRIPTS_DIR + "arm/flash-cortex.sh"
 MK_STOPFLASH_SCRIPT = PRG_SCRIPTS_DIR + "arm/stopopenocd.sh"
-MK_DEBUG_SCRIPT = PRG_SCRIPTS_DIR + "arm/debug-cortex.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"

diff --git a/examples/develgps/develgps.mk b/examples/develgps/develgps.mk
index 7b8299ed964be62e3624c504955c48f298eb51ec..bc27bd3dd5313bc55cc2935fabcd9189496165ae 100644 (file)
--- a/examples/develgps/develgps.mk
+++ b/examples/develgps/develgps.mk
@@ -66,11 +66,11 @@ develgps_LDFLAGS = -nostartfiles -T bertos/cpu/cortex-m3/scripts/lm3s1968_rom.ld
 
 develgps_CPU = cortex-m3
 
-develgps_PROGRAMMER_CPU = lm3s1968
-develgps_PROGRAMMER_TYPE = lm3s1968
+develgps_PROGRAMMER_CPU = lm3s
+develgps_PROGRAMMER_TYPE = luminary
 develgps_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-cortex.sh
 develgps_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
-develgps_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug-cortex.sh
+develgps_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh
 develgps_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
 
 ifeq ($(develgps_DEBUG),0)

diff --git a/examples/lm3s1968/lm3s1968.mk b/examples/lm3s1968/lm3s1968.mk
index 0dca92fd8ce957adafedce503a6aedaf408e78b5..38f29d3eb170ca9080bc0993888af77018ddac72 100644 (file)
--- a/examples/lm3s1968/lm3s1968.mk
+++ b/examples/lm3s1968/lm3s1968.mk
@@ -66,11 +66,11 @@ lm3s1968_LDFLAGS = -nostartfiles -T bertos/cpu/cortex-m3/scripts/lm3s1968_rom.ld
 
 lm3s1968_CPU = cortex-m3
 
-lm3s1968_PROGRAMMER_CPU = lm3s1968
-lm3s1968_PROGRAMMER_TYPE = lm3s1968
+lm3s1968_PROGRAMMER_CPU = lm3s
+lm3s1968_PROGRAMMER_TYPE = luminary
 lm3s1968_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-cortex.sh
 lm3s1968_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
-lm3s1968_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug-cortex.sh
+lm3s1968_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh
 lm3s1968_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
 
 ifeq ($(lm3s1968_DEBUG),0)

diff --git a/examples/lm3s8962/lm3s8962.mk b/examples/lm3s8962/lm3s8962.mk
index c76d022e87f79b484ef201c633ed7d7daac33107..51cee8e0ae01cf7763c8dd14465975321ed2bccb 100644 (file)
--- a/examples/lm3s8962/lm3s8962.mk
+++ b/examples/lm3s8962/lm3s8962.mk
@@ -61,11 +61,11 @@ lm3s8962_LDFLAGS = -nostartfiles -T bertos/cpu/cortex-m3/scripts/lm3s1968_rom.ld
 
 lm3s8962_CPU = cortex-m3
 
-lm3s8962_PROGRAMMER_CPU = lm3s1968
-lm3s8962_PROGRAMMER_TYPE = lm3s1968
+lm3s8962_PROGRAMMER_CPU = lm3s
+lm3s8962_PROGRAMMER_TYPE = lm3s
 lm3s8962_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-cortex.sh
 lm3s8962_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
-lm3s8962_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug-cortex.sh
+lm3s8962_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh
 lm3s8962_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
 
 ifeq ($(lm3s8962_DEBUG),0)