From a7a13695011942ab3926ff76e2298099eff89542 Mon Sep 17 00:00:00 2001 From: arighi Date: Thu, 29 Apr 2010 11:04:38 +0000 Subject: [PATCH] lm3s: flash and debug script refactoring. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3569 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cpu/cortex-m3/info/LM3S1968.cdef | 2 +- bertos/cpu/cortex-m3/info/LM3S8962.cdef | 2 +- bertos/cpu/cortex-m3/info/cm3.common | 2 +- examples/develgps/develgps.mk | 6 +++--- examples/lm3s1968/lm3s1968.mk | 6 +++--- examples/lm3s8962/lm3s8962.mk | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bertos/cpu/cortex-m3/info/LM3S1968.cdef b/bertos/cpu/cortex-m3/info/LM3S1968.cdef index c3019c43..494042cc 100644 --- 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 f67e7c2a..3491c728 100644 --- 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 f7f078af..881bf0b1 100644 --- 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 7b8299ed..bc27bd3d 100644 --- 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 0dca92fd..38f29d3e 100644 --- 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 c76d022e..51cee8e0 100644 --- 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) -- 2.25.1