From 3616b93eee128b0c12fa0d453fbe6ced998e482f Mon Sep 17 00:00:00 2001
From: Spencer Oliver <ntfreak@users.sourceforge.net>
Date: Thu, 17 Dec 2009 10:53:09 +0000
Subject: [PATCH] target.cfg: update to use new flash configuration syntax

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
---
 tcl/target/aduc702x.cfg  | 2 +-
 tcl/target/faux.cfg      | 2 +-
 tcl/target/lpc2900.cfg   | 2 +-
 tcl/target/mega128.cfg   | 2 +-
 tcl/target/pic32mx.cfg   | 4 ++--
 tcl/target/sam7se512.cfg | 2 +-
 tcl/target/sam7x256.cfg  | 2 +-
 tcl/target/str710.cfg    | 4 ++--
 tcl/target/str730.cfg    | 2 +-
 tcl/target/str750.cfg    | 4 ++--
 tcl/target/str912.cfg    | 4 ++--
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tcl/target/aduc702x.cfg b/tcl/target/aduc702x.cfg
index 58cc9b987..50b2a0de5 100644
--- a/tcl/target/aduc702x.cfg
+++ b/tcl/target/aduc702x.cfg
@@ -36,7 +36,7 @@ $_TARGETNAME configure -work-area-phys 0x10000 -work-area-size 0x2000
 ## flash configuration
 # only target number is needed
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME aduc702x 0 0 0 0 0
+flash bank $_FLASHNAME aduc702x 0 0 0 0 $_TARGETNAME
 
 ## If you use the watchdog, the following code makes sure that the board
 ## doesn't reboot when halted via JTAG.  Yes, on the older generation
diff --git a/tcl/target/faux.cfg b/tcl/target/faux.cfg
index 6fe0cd799..b2bdb2b6a 100644
--- a/tcl/target/faux.cfg
+++ b/tcl/target/faux.cfg
@@ -27,4 +27,4 @@ target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAM
 
 #dummy flash driver
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME faux 0x01000000 0x200000 2 2 0
+flash bank $_FLASHNAME faux 0x01000000 0x200000 2 2 $_TARGETNAME
diff --git a/tcl/target/lpc2900.cfg b/tcl/target/lpc2900.cfg
index 769d39d4e..b2580861e 100644
--- a/tcl/target/lpc2900.cfg
+++ b/tcl/target/lpc2900.cfg
@@ -63,4 +63,4 @@ arm7_9 dcc_downloads enable
 # Flash:   flash bank lpc2900 0 0 0 0 <target#> <flash clock (CLK_SYS_FMC) in kHz>
 # Flash base address, total flash size, and number of sectors are all configured automatically.
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME lpc2900         0 0 0 0 $_TARGETNAME $FLASH_CLOCK
+flash bank $_FLASHNAME lpc2900 0 0 0 0 $_TARGETNAME $FLASH_CLOCK
diff --git a/tcl/target/mega128.cfg b/tcl/target/mega128.cfg
index 2bc229497..2cf31d619 100644
--- a/tcl/target/mega128.cfg
+++ b/tcl/target/mega128.cfg
@@ -23,7 +23,7 @@ target create $_TARGETNAME avr -endian $_ENDIAN -chain-position $_TARGETNAME
 #$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 16384 -work-area-backup 0
 
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME avr 0 0 0 0 0
+flash bank $_FLASHNAME avr 0 0 0 0 $_TARGETNAME
 
 #to use it, script will be like:
 #init
diff --git a/tcl/target/pic32mx.cfg b/tcl/target/pic32mx.cfg
index a346c471c..e0ebdc267 100644
--- a/tcl/target/pic32mx.cfg
+++ b/tcl/target/pic32mx.cfg
@@ -34,9 +34,9 @@ target create $_TARGETNAME mips_m4k -endian $_ENDIAN -chain-position $_TARGETNAM
 $_TARGETNAME configure -work-area-phys 0xa0000000 -work-area-size 16384 -work-area-backup 0
 
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME pic32mx 0xbd000000 0 0 0 0
+flash bank $_FLASHNAME pic32mx 0xbd000000 0 0 0 $_TARGETNAME
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME pic32mx 0xbfc00000 0 0 0 0
+flash bank $_FLASHNAME pic32mx 0xbfc00000 0 0 0 $_TARGETNAME
 
 # For more information about the configuration files, take a look at:
 # openocd.texi
diff --git a/tcl/target/sam7se512.cfg b/tcl/target/sam7se512.cfg
index d2550678b..c48afeffd 100644
--- a/tcl/target/sam7se512.cfg
+++ b/tcl/target/sam7se512.cfg
@@ -36,5 +36,5 @@ $_TARGETNAME configure -work-area-phys 0x00200000 -work-area-size 0x4000 -work-a
 
 #flash bank <driver> <base_addr> <size> <chip_width> <bus_width> <target_number> [<target_name> <banks> <sectors_per_bank> <pages_per_sector> <page_size> <num_nvmbits> <ext_freq_khz>]
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME at91sam7 0 0 0 0 0 0 0 0 0 0 0 0 18432
+flash bank $_FLASHNAME at91sam7 0 0 0 0 $_TARGETNAME 0 0 0 0 0 0 0 18432
 
diff --git a/tcl/target/sam7x256.cfg b/tcl/target/sam7x256.cfg
index 5bab64215..19145e5c5 100644
--- a/tcl/target/sam7x256.cfg
+++ b/tcl/target/sam7x256.cfg
@@ -47,7 +47,7 @@ $_TARGETNAME configure -work-area-phys 0x00200000 -work-area-size 0x4000 -work-a
 
 #flash bank <driver> <base_addr> <size> <chip_width> <bus_width> <target_number> [<target_name> <banks> <sectors_per_bank> <pages_per_sector> <page_size> <num_nvmbits> <ext_freq_khz>]
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME at91sam7 0 0 0 0 0 0 0 0 0 0 0 0 18432
+flash bank $_FLASHNAME at91sam7 0 0 0 0 $_TARGETNAME 0 0 0 0 0 0 0 18432
 
 # For more information about the configuration files, take a look at:
 # openocd.texi
diff --git a/tcl/target/str710.cfg b/tcl/target/str710.cfg
index 395a26cdf..9da69acad 100644
--- a/tcl/target/str710.cfg
+++ b/tcl/target/str710.cfg
@@ -40,9 +40,9 @@ $_TARGETNAME configure -work-area-phys 0x2000C000 -work-area-size 0x4000 -work-a
 
 #flash bank str7x <base> <size> 0 0 <target#> <variant>
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME str7x 0x40000000 0x00040000 0 0 0 STR71x
+flash bank $_FLASHNAME str7x 0x40000000 0x00040000 0 0 $_TARGETNAME STR71x
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME str7x 0x400C0000 0x00004000 0 0 0 STR71x
+flash bank $_FLASHNAME str7x 0x400C0000 0x00004000 0 0 $_TARGETNAME STR71x
 
 # For more information about the configuration files, take a look at:
 # openocd.texi
diff --git a/tcl/target/str730.cfg b/tcl/target/str730.cfg
index 6432d1542..381fa5fca 100644
--- a/tcl/target/str730.cfg
+++ b/tcl/target/str730.cfg
@@ -43,5 +43,5 @@ $_TARGETNAME configure -work-area-phys 0x40000000 -work-area-size 0x4000 -work-a
 
 #flash bank <driver> <base> <size> <chip_width> <bus_width>
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME str7x 0x20000000 0x00040000 0 0 0 STR3x
+flash bank $_FLASHNAME str7x 0x20000000 0x00040000 0 0 $_TARGETNAME STR3x
 
diff --git a/tcl/target/str750.cfg b/tcl/target/str750.cfg
index 496c4e3cf..5df968bfc 100644
--- a/tcl/target/str750.cfg
+++ b/tcl/target/str750.cfg
@@ -46,7 +46,7 @@ $_TARGETNAME configure -work-area-phys 0x40000000 -work-area-size 0x4000 -work-a
 
 #flash bank <driver> <base> <size> <chip_width> <bus_width>
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME str7x 0x20000000 0x00040000 0 0 0 STR75x
+flash bank $_FLASHNAME str7x 0x20000000 0x00040000 0 0 $_TARGETNAME STR75x
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME str7x 0x200C0000 0x00004000 0 0 0 STR75x
+flash bank $_FLASHNAME str7x 0x200C0000 0x00004000 0 0 $_TARGETNAME STR75x
 
diff --git a/tcl/target/str912.cfg b/tcl/target/str912.cfg
index d84458495..2defe9fdd 100644
--- a/tcl/target/str912.cfg
+++ b/tcl/target/str912.cfg
@@ -64,9 +64,9 @@ $_TARGETNAME configure -work-area-phys 0x50000000 -work-area-size 16384 -work-ar
 
 #flash bank str9x <base> <size> 0 0 <target#> <variant>
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME str9x 0x00000000 0x00080000 0 0 0
+flash bank $_FLASHNAME str9x 0x00000000 0x00080000 0 0 $_TARGETNAME
 set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME str9x 0x00080000 0x00008000 0 0 0
+flash bank $_FLASHNAME str9x 0x00080000 0x00008000 0 0 $_TARGETNAME
 
 # For more information about the configuration files, take a look at:
 # openocd.texi
-- 
2.11.4.GIT