From 41284acd34b5d1a66547bf37d782c4456731dd24 Mon Sep 17 00:00:00 2001 From: batt Date: Fri, 4 Sep 2009 20:27:37 +0000 Subject: [PATCH] Refactor to comply to new script interface. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2884 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cpu/arm/info/at91sam7.common | 4 ++-- bertos/cpu/avr/info/avr.common | 4 ++-- examples/at91sam7/at91sam7s.mk | 2 ++ examples/at91sam7/at91sam7x.mk | 2 ++ examples/triface/triface.mk | 16 ++++++++++------ 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/bertos/cpu/arm/info/at91sam7.common b/bertos/cpu/arm/info/at91sam7.common index 654cb0bc..3088ccff 100644 --- a/bertos/cpu/arm/info/at91sam7.common +++ b/bertos/cpu/arm/info/at91sam7.common @@ -71,9 +71,9 @@ SCRIPT_DIR = CPU_DIR + "arm/scripts/" HW_DIR = CPU_DIR + "arm/hw/" MK_FLASH_SCRIPT = PRG_SCRIPTS_DIR + "arm/flash.sh" -MK_STOPFLASH_SCRIPT = PRG_SCRIPTS_DIR + "arm/stopflash.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/stopdebug.sh" +MK_STOPDEBUG_SCRIPT = PRG_SCRIPTS_DIR + "arm/stopopenocd.sh" GDB_INIT_SCRIPT = PRG_SCRIPTS_DIR + "arm/openocd/gdbinit-sam7" diff --git a/bertos/cpu/avr/info/avr.common b/bertos/cpu/avr/info/avr.common index 41b8d0d2..2d8c7758 100644 --- a/bertos/cpu/avr/info/avr.common +++ b/bertos/cpu/avr/info/avr.common @@ -61,8 +61,8 @@ SCRIPT_DIR = CPU_DIR + "avr/scripts/" MK_FLASH_SCRIPT = PRG_SCRIPTS_DIR + "avr/flash.sh" MK_STOPFLASH_SCRIPT = PRG_SCRIPTS_DIR + "avr/stopflash.sh" -MK_DEBUG_SCRIPT = PRG_SCRIPTS_DIR + "avr/debug.sh" -MK_STOPDEBUG_SCRIPT = PRG_SCRIPTS_DIR + "avr/stopdebug.sh" +MK_DEBUG_SCRIPT = PRG_SCRIPTS_DIR + "nodebug.sh" +MK_STOPDEBUG_SCRIPT = PRG_SCRIPTS_DIR + "none.sh" # Common GCC flags. MK_CPU_CPPFLAGS = "-Os -fno-strict-aliasing -I" + CPU_DIR + "avr/" diff --git a/examples/at91sam7/at91sam7s.mk b/examples/at91sam7/at91sam7s.mk index e9b96498..5826e92a 100644 --- a/examples/at91sam7/at91sam7s.mk +++ b/examples/at91sam7/at91sam7s.mk @@ -49,4 +49,6 @@ at91sam7s_CPU = arm7tdmi at91sam7s_PROGRAMMER_CPU = at91sam7 at91sam7s_PROGRAMMER_TYPE = jtag-tiny at91sam7s_FLASH_SCRIPT = bertos/prg_scripts/arm/flash.sh +at91sam7s_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh at91sam7s_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh +at91sam7s_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh diff --git a/examples/at91sam7/at91sam7x.mk b/examples/at91sam7/at91sam7x.mk index 59b50edf..2946d06f 100644 --- a/examples/at91sam7/at91sam7x.mk +++ b/examples/at91sam7/at91sam7x.mk @@ -49,4 +49,6 @@ at91sam7x_CPU = arm7tdmi at91sam7x_PROGRAMMER_CPU = at91sam7 at91sam7x_PROGRAMMER_TYPE = jtag-tiny at91sam7x_FLASH_SCRIPT = bertos/prg_scripts/arm/flash.sh +at91sam7x_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh at91sam7x_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh +at91sam7x_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh diff --git a/examples/triface/triface.mk b/examples/triface/triface.mk index 3d200616..68c8b721 100644 --- a/examples/triface/triface.mk +++ b/examples/triface/triface.mk @@ -62,7 +62,9 @@ triface_PROGRAMMER_CPU = atmega1281 triface_PROGRAMMER_TYPE = stk500v2 triface_PROGRAMMER_PORT = /dev/ttyS1 triface_FLASH_SCRIPT = bertos/prg_scripts/avr/flash.sh -triface_DEBUG_SCRIPT = bertos/prg_scripts/avr/debug.sh +triface_STOPFLASH_SCRIPT = bertos/prg_scripts/none.sh +triface_DEBUG_SCRIPT = bertos/prg_scripts/nodebug.sh +triface_STOPDEBUG_SCRIPT = bertos/prg_scripts/none.sh # Set to 1 for debug builds boot_DEBUG = 0 @@ -91,8 +93,10 @@ boot_CFLAGS = -Os -mcall-prologues boot_LDFLAGS = -Wl,--relax -Wl,--section-start=.text=$(BOOT_ADDR_START) -boot_PROGRAMMER_CPU = atmega1281 -boot_PROGRAMMER_TYPE = stk500v2 -boot_PROGRAMMER_PORT = /dev/ttyS1 -boot_FLASH_SCRIPT = bertos/prg_scripts/avr/flash.sh -boot_DEBUG_SCRIPT = bertos/prg_scripts/avr/debug.sh +boot_PROGRAMMER_CPU = $(triface_PROGRAMMER_CPU) +boot_PROGRAMMER_TYPE = $(triface_PROGRAMMER_TYPE) +boot_PROGRAMMER_PORT = $(triface_PROGRAMMER_PORT) +boot_FLASH_SCRIPT = $(triface_FLASH_SCRIPT) +boot_STOPFLASH_SCRIPT = $(triface_STOPFLASH_SCRIPT) +boot_DEBUG_SCRIPT = $(triface_DEBUG_SCRIPT) +boot_STOPDEBUG_SCRIPT = $(triface_STOPDEBUG_SCRIPT) -- 2.25.1