Refactor to comply to new script interface.

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

diff --git a/bertos/cpu/arm/info/at91sam7.common b/bertos/cpu/arm/info/at91sam7.common
index 654cb0bca5c8b5eef107f63a2004619dd163eae9..3088ccff24e2f4769b9140ca43afec2182b1225a 100644 (file)
--- 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"
 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_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"
 
 
 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 41b8d0d299ed6efb39a2fcbcca86bb9231d6998d..2d8c775819fb299643d1702f6c227a45002e325d 100644 (file)
--- 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_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/"
 
 # 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 e9b96498f849189dafe499002e76cd2bea436dd1..5826e92a295460f699365680eb9fc23bc2e9361d 100644 (file)
--- 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_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_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 59b50edfef49f27378deba2aa3b4e76efe2349e7..2946d06f02b102dc6093ec76570d05a68f301cf3 100644 (file)
--- 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_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_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 3d2006168722e9e7b65b566098b3ca96af50ad5e..68c8b721adbd43150d7dd6600edee0f498ef0b81 100644 (file)
--- 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_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
 
 # 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_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)