Rick Altherr <kc8apf@kc8apf.net> - update syntax

git-svn-id: svn://svn.berlios.de/openocd/trunk@1114 b42882b7-edfa-0310-969c-e2dbd0fdcd60

37 files changed, 70 insertions, 114 deletions

diff --git a/src/target/target/aduc702x.cfg b/src/target/target/aduc702x.cfg
index 5c297fbe..c9ef92cd 100644
--- a/src/target/target/aduc702x.cfg
+++ b/src/target/target/aduc702x.cfg
@@ -15,13 +15,13 @@ jtag_device 4 0x1 0xf 0xe
 ##
 ## Target configuration
 ##
-target arm7tdmi little 0
+target create target0 arm7tdmi -endian little -chain-position 0
 
 ## software initiated reset (if your SRST isn't wired)
 #proc target_0_reset {} { mwb 0x0ffff0230 04 }
 
 # use top 1k of SRAM for as temporary JTAG memory 
-#working_area 0 0x11C00 0x400 backup
+#[new_target_name] configure -work-area-virt 0 -work-area-phys 0x11C00 -work-area-size 0x400 -work-area-backup 1
 
 ## flash configuration
 flash bank aduc702x 0x80000 0x10000 2 2 0
diff --git a/src/target/target/at91eb40a.cfg b/src/target/target/at91eb40a.cfg
index 60153be9..b2b91dbc 100644
--- a/src/target/target/at91eb40a.cfg
+++ b/src/target/target/at91eb40a.cfg
@@ -14,7 +14,7 @@ reset_config srst_only srst_pulls_trst
 jtag_device 4 0x1 0xf 0xe
 
 #target configuration
-target arm7tdmi little 0 arm7tdmi-s_r4
+target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi-s_r4
 
 # speed up memory downloads
 arm7_9 fast_memory_access enable
@@ -25,8 +25,7 @@ flash bank ecosflash 0x01000000 0x200000 2 2 0 ecos/at91eb40a.elf
 
 # required for usable performance. Used for lots of
 # other things than flash programming.
-working_area 0 0x00030000 0x10000 nobackup
-
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x00030000 -work-area-size 0x10000 -work-area-backup 0
 
 [new_target_name] configure -event reset-init {
 	puts "Running reset init script for AT91EB40A"
diff --git a/src/target/target/at91r40008.cfg b/src/target/target/at91r40008.cfg
index 7c4be18e..6ed69576 100644
--- a/src/target/target/at91r40008.cfg
+++ b/src/target/target/at91r40008.cfg
@@ -8,14 +8,13 @@ reset_config srst_only srst_pulls_trst
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag_device 4 0x1 0xf 0xe
 
-#target <type> <startup mode>
-#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
-target arm7tdmi little 0 arm7tdmi
+target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
 
 
 [new_target_name] configure -event old-gdb_program_config { script event/at91r40008_reset.script }
 
-working_area 0 0x3C000 0x4000 nobackup 
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x3C000 -work-area-size 0x4000 -work-area-backup 0
+
 flash bank cfi 0x10000000 0x400000 2 2 0
 
 # For more information about the configuration files, take a look at:
diff --git a/src/target/target/at91sam9260.cfg b/src/target/target/at91sam9260.cfg
index a9ef6a0d..63d20fb7 100644
--- a/src/target/target/at91sam9260.cfg
+++ b/src/target/target/at91sam9260.cfg
@@ -14,15 +14,11 @@ jtag_ntrst_delay 0
 # Target configuration
 ######################
 
-#target <type> <endianess> <reset mode> <JTAG pos> <variant>
-target arm926ejs little 0 arm926ejs
+target create target0 arm926ejs -endian little -chain-position 0 -variant arm926ejs
 
 [new_target_name] configure -event reset-init { script event/at91sam9260_reset.script }
 
-
-#working area <target#> <address> <size> <backup|nobackup>
-working_area 0 0x00300000 0x1000 backup
-
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x00300000 -work-area-size 0x1000 -work-area-backup 1
 
 #####################
 # Flash configuration
diff --git a/src/target/target/at91sam9260minimal.cfg b/src/target/target/at91sam9260minimal.cfg
index 70e88749..ca6edd9b 100644
--- a/src/target/target/at91sam9260minimal.cfg
+++ b/src/target/target/at91sam9260minimal.cfg
@@ -14,7 +14,6 @@ jtag_ntrst_delay 200
 # Target configuration
 ######################
 
-#target <type> <endianess> <reset mode> <JTAG pos> <variant>
-target arm926ejs little 0 arm926ejs
+target create target0 arm926ejs -endian little -chain-position 0 -variant arm926ejs
 
 
diff --git a/src/target/target/eir-sam7se512.cfg b/src/target/target/eir-sam7se512.cfg
index a378a203..dfc24755 100644
--- a/src/target/target/eir-sam7se512.cfg
+++ b/src/target/target/eir-sam7se512.cfg
@@ -5,12 +5,12 @@ reset_config srst_only srst_pulls_trst
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag_device 4 0x1 0xf 0xe
 
-target arm7tdmi little 0 arm7tdmi
+target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
 
 
 [new_target_name] configure -event reset-init { script event/eir-sam7se512_reset.script }
 
-working_area 0 0x00200000 0x4000 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x4000 -work-area-backup 0
 
 #flash bank <driver> <base> <size> <chip_width> <bus_width>
 flash bank at91sam7 0 0 0 0 0
diff --git a/src/target/target/epc9301.cfg b/src/target/target/epc9301.cfg
index f1e479d9..31ff3320 100644
--- a/src/target/target/epc9301.cfg
+++ b/src/target/target/epc9301.cfg
@@ -3,8 +3,8 @@ jtag_device 4 0x1 0xf 0xe
 jtag_nsrst_delay 100
 jtag_ntrst_delay 100
 
-target arm920t little 0
-working_area 0 0x80014000 0x1000 backup
+target create target0 arm920t -endian little -chain-position 0 -work-area-virt 0 -work-area-phys 0x80014000 -work-area-size 0x1000 -work-area-backup 1
+
 #flash configuration
 #flash bank <driver> <base> <size> <chip_width> <bus_width> [driver_options ...]
 flash bank cfi 0x60000000 0x1000000 2 2 0
diff --git a/src/target/target/hammer.cfg b/src/target/target/hammer.cfg
index 627266d2..b267861f 100644
--- a/src/target/target/hammer.cfg
+++ b/src/target/target/hammer.cfg
@@ -9,17 +9,14 @@ reset_config trst_and_srst
 jtag_device 4 0x1 0xf 0xe
 
 
-target arm920t little 0 arm920t
+target create target0 arm920t -endian little -chain-position 0 -variant arm920t
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x40800000 -work-area-size 0x20000 -work-area-backup 0
 [new_target_name] configure -event reset-init { script event/hammer_reset.script }
 
 # speed up memory downloads
 arm7 fast_memory_access enable
 arm7_9 dcc_downloads enable
 
-
-working_area 0 0x30800000 0x20000 nobackup
-
-
 #flash configuration
 #flash bank <driver> <base> <size> <chip_width> <bus_width> [driver_options ...]
 flash bank cfi 0x00000000 0x1000000 2 2 0
diff --git a/src/target/target/imx31.cfg b/src/target/target/imx31.cfg
index cf18f3e0..34b35d8b 100644
--- a/src/target/target/imx31.cfg
+++ b/src/target/target/imx31.cfg
@@ -15,5 +15,5 @@ jtag_device 5 0x1 0x0 0x1e
 jtag_nsrst_delay 500
 jtag_ntrst_delay 500
 
-target arm11 little 1
+target create target0 arm11 -endian little -chain-position 1
  
diff --git a/src/target/target/ipx42x.cfg b/src/target/target/ipx42x.cfg
index 9445992c..f2185f80 100644
--- a/src/target/target/ipx42x.cfg
+++ b/src/target/target/ipx42x.cfg
@@ -5,5 +5,5 @@ reset_config srst_only srst_pulls_trst
 #jtag scan chain
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag_device 7 0x1 0x7f 0x7e
-target xscale big 0 IXP42x
+target create target0 xscale -endian big -chain-position 0 -variant IXP42x
 
diff --git a/src/target/target/lm3s3748.cfg b/src/target/target/lm3s3748.cfg
index ff3d7158..bb35181c 100644
--- a/src/target/target/lm3s3748.cfg
+++ b/src/target/target/lm3s3748.cfg
@@ -19,10 +19,10 @@ jtag_device 4 0x1 0xf 0xe
 # the luminary variant causes a software reset rather than asserting SRST
 # this stops the debug registers from being cleared
 # this will be fixed in later revisions of silicon
-target cortex_m3 little 0 lm3s
+target create target0 cortex_m3 -endian little -chain-position 0 -variant lm3s
 
 # 8k working area at base of ram
-working_area 0 0x20000000 0x2000 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x2000 -work-area-backup 0
 
 #flash configuration
 flash bank stellaris 0 0 0 0 0
diff --git a/src/target/target/lm3s6965.cfg b/src/target/target/lm3s6965.cfg
index b9e8ce20..e1d38227 100644
--- a/src/target/target/lm3s6965.cfg
+++ b/src/target/target/lm3s6965.cfg
@@ -16,10 +16,10 @@ jtag_device 4 0x1 0xf 0xe
 # the luminary variant causes a software reset rather than asserting SRST
 # this stops the debug registers from being cleared
 # this will be fixed in later revisions of silicon
-target cortex_m3 little 0 lm3s
+target create target0 cortex_m3 -endian little -chain-position 0 -variant lm3s
 
 # 4k working area at base of ram
-working_area 0 0x20000000 0x4000 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x4000 -work-area-backup 0
 
 #flash configuration
 flash bank stellaris 0 0 0 0 0
diff --git a/src/target/target/lm3s811.cfg b/src/target/target/lm3s811.cfg
index 2cfd4e17..90543334 100644
--- a/src/target/target/lm3s811.cfg
+++ b/src/target/target/lm3s811.cfg
@@ -16,10 +16,10 @@ jtag_device 4 0x1 0xf 0xe
 # the luminary variant causes a software reset rather than asserting SRST
 # this stops the debug registers from being cleared
 # this will be fixed in later revisions of silicon
-target cortex_m3 little 0 lm3s
+target create target0 cortex_m3 -endian little -chain-position 0 -variant lm3s
 
 # 8k working area at base of ram
-working_area 0 0x20000000 0x2000 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x2000 -work-area-backup 0
 
 #flash configuration
 flash bank stellaris 0 0 0 0 0
diff --git a/src/target/target/lpc2129.cfg b/src/target/target/lpc2129.cfg
index b9a33089..d94f8228 100644
--- a/src/target/target/lpc2129.cfg
+++ b/src/target/target/lpc2129.cfg
@@ -4,8 +4,9 @@ reset_config trst_and_srst srst_pulls_trst
 #jtag scan chain
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag_device 4 0x1 0xf 0xe
-target arm7tdmi little 0 arm7tdmi-s_r4
+target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi-s_r4
+
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0
 
-working_area 0 0x40000000 0x4000 nobackup
 #flash bank <driver> <base> <size> <chip_width> <bus_width>
 flash bank lpc2000 0x0 0x40000 0 0 0 lpc2000_v1 14765 calc_checksum
diff --git a/src/target/target/lpc2148.cfg b/src/target/target/lpc2148.cfg
index 67b3d11c..24ec05ed 100644
--- a/src/target/target/lpc2148.cfg
+++ b/src/target/target/lpc2148.cfg
@@ -13,7 +13,7 @@ reset_config trst_and_srst srst_pulls_trst
 #jtag scan chain
 jtag_device 4 0x1 0xf 0xe
 
-target arm7tdmi little 0 arm7tdmi-s_r4
+target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi-s_r4
 [new_target_name] configure -event reset-init {
 	# Force target into ARM state
 	soft_reset_halt
@@ -22,7 +22,7 @@ target arm7tdmi little 0 arm7tdmi-s_r4
 	
 }
 
-working_area 0 0x40000000 0x4000 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0
 
 #flash bank lpc2000 <base> <size> 0 0 <target#> <variant>
 flash bank lpc2000 0x0 0x7d000 0 0 0 lpc2000_v2 14765
diff --git a/src/target/target/lpc2294.cfg b/src/target/target/lpc2294.cfg
index df1a3e2f..bd282eba 100644
--- a/src/target/target/lpc2294.cfg
+++ b/src/target/target/lpc2294.cfg
@@ -5,12 +5,8 @@ reset_config trst_and_srst srst_pulls_trst
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag_device 4 0x1 0xf 0xe
 
-#target <type> <startup mode>
-#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
-target arm7tdmi little 0 arm7tdmi-s_r4
-
-
-working_area 0 0x40000000 0x4000 nobackup
+target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi-s_r4
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0
 
 #flash configuration
 #flash bank lpc2000 <base> <size> 0 0 <target#> <variant>
diff --git a/src/target/target/netx500.cfg b/src/target/target/netx500.cfg
index 21a0e10c..e7b5e51a 100644
--- a/src/target/target/netx500.cfg
+++ b/src/target/target/netx500.cfg
@@ -6,5 +6,5 @@ reset_config trst_and_srst
 jtag_device 4 0x1 0xf 0xe
 jtag_nsrst_delay 100
 jtag_ntrst_delay 100
-target arm926ejs little 0 arm926ejs
+target create target0 arm926ejs -endian little -chain-position 0 -variant arm926ejs
 
diff --git a/src/target/target/nslu2.cfg b/src/target/target/nslu2.cfg
index 53907bc5..c545e01f 100644
--- a/src/target/target/nslu2.cfg
+++ b/src/target/target/nslu2.cfg
@@ -6,12 +6,12 @@ reset_config srst_only
 jtag_device 7 0x1 0x7f 0x7e
 
 # target configuration
-target xscale big 0 ixp42x
+target create target0 xscale -endian big -chain-position 0 -variant ixp42x
 
 
 # maps to PXA internal RAM.  If you are using a PXA255
 # you must initialize SDRAM or leave this option off
-working_area 0 0x00020000 0x10000 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x00020000 -work-area-size 0x10000 -work-area-backup 0
 
 # flash bank <driver> <base> <size> <chip_width> <bus_width>
 #flash bank cfi 0x50000000 0x1000000 2 4 0 
diff --git a/src/target/target/omap5912.cfg b/src/target/target/omap5912.cfg
index fdc8e71f..c1e34eaa 100644
--- a/src/target/target/omap5912.cfg
+++ b/src/target/target/omap5912.cfg
@@ -10,11 +10,11 @@ jtag_device 38 0x0 0x0 0x0
 jtag_device 4  0x1 0x0 0xe
 jtag_device 8  0x0 0x0 0x0
 
-target arm926ejs little 1 arm926ejs
+target create target0 arm926ejs -endian little -chain-position 1 -variant arm926ejs
 [new_target_name] configure -event reset-init { script event/omap5912_reset.script }
 
 # omap5912 lcd frame buffer as working area
-working_area 0 0x20000000 0x3e800 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x3e800 -work-area-backup 0
 
 #flash bank <driver> <base> <size> <chip_width> <bus_width>
 flash bank cfi 0x00000000 0x1000000 2 2 0
diff --git a/src/target/target/pic32mx.cfg b/src/target/target/pic32mx.cfg
index 6b6e8b30..1d23ff2a 100644
--- a/src/target/target/pic32mx.cfg
+++ b/src/target/target/pic32mx.cfg
@@ -8,12 +8,8 @@ reset_config srst_only
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag_device 5 0x1 0x1 0x1e
 
-#target <type> <startup mode>
-#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
-target mips_m4k little 0
-
-
-working_area 0 0xa0000000 16384 nobackup
+target create target0 mips_m4k -endian little -chain-position 0
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0xa0000000 -work-area-size 16384 -work-area-backup 0
 
 #flash bank str7x <base> <size> 0 0 <target#> <variant>
 #flash bank stm32x 0 0 0 0 0
diff --git a/src/target/target/pxa255.cfg b/src/target/target/pxa255.cfg
index 6a5c12bb..c5a27be0 100644
--- a/src/target/target/pxa255.cfg
+++ b/src/target/target/pxa255.cfg
@@ -2,7 +2,7 @@ jtag_device 5 0x1 0x1f 0x1e
 jtag_nsrst_delay 200
 jtag_ntrst_delay 200
 
-target xscale little 0 pxa255
+target create target0 xscale -endian little -chain-position 0 -variant pxa255
 [new_target_name] configure -event reset-init { script event/pxa255_reset.script }
 
 reset_config trst_and_srst
diff --git a/src/target/target/pxa255_sst.cfg b/src/target/target/pxa255_sst.cfg
index b9273692..49ebd2b3 100644
--- a/src/target/target/pxa255_sst.cfg
+++ b/src/target/target/pxa255_sst.cfg
@@ -10,4 +10,5 @@
 script target/pxa255.cfg
 # flash bank <driver> <base> <size> <chip_width> <bus_width> <targetNum> [options]
 flash bank cfi 0x00000000 0x80000 2 2 0 jedec_probe
-working_area 0 0x4000000 0x4000 nobackup 0
+
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x4000000 -work-area-size 0x4000 -work-area-backup 0
diff --git a/src/target/target/pxa270.cfg b/src/target/target/pxa270.cfg
index 5818dc2d..dcf5fa2b 100644
--- a/src/target/target/pxa270.cfg
+++ b/src/target/target/pxa270.cfg
@@ -10,10 +10,10 @@ reset_config trst_and_srst separate
 #jtag scan chain
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag_device 7 0x1 0x7f 0x7e
-target xscale little 0 pxa27x
+target create target0 xscale -endian little -chain-position 0 -variant pxa27x
 # maps to PXA internal RAM. If you are using a PXA255
 # you must initialize SDRAM or leave this option off
-working_area 0 0x5c000000 0x10000 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x5c000000 -work-area-size 0x10000 -work-area-backup 0
 
 #flash bank <driver> <base> <size> <chip_width> <bus_width>
 # works for P30 flash
diff --git a/src/target/target/s3c2440.cfg b/src/target/target/s3c2440.cfg
index 6e00a1ee..6227107b 100644
--- a/src/target/target/s3c2440.cfg
+++ b/src/target/target/s3c2440.cfg
@@ -7,10 +7,9 @@
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag_device 4 0x1 0xf 0xe
 
-#target <type> <startup mode>
-target arm920t little 0 arm920t
+target create target0 arm920t -endian little -chain-position 0 -variant arm920t
 
 #reset configuration
 reset_config trst_and_srst
 
-working_area 0 0x200000 0x4000 backup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x200000 -work-area-size 0x4000 -work-area-backup 1
diff --git a/src/target/target/sam7x256.cfg b/src/target/target/sam7x256.cfg
index e0030c7a..026d4022 100644
--- a/src/target/target/sam7x256.cfg
+++ b/src/target/target/sam7x256.cfg
@@ -5,12 +5,10 @@ reset_config srst_only srst_pulls_trst
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag_device 4 0x1 0xf 0xe
 
-#target <type> <startup mode>
-#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
-target arm7tdmi little 0 arm7tdmi
+target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
 [new_target_name] configure -event reset-init { script event/sam7x256_reset.script }
 
-working_area 0 0x00200000 0x4000 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x4000 -work-area-backup 0
 
 #flash bank <driver> <base> <size> <chip_width> <bus_width>
 flash bank at91sam7 0 0 0 0 0
diff --git a/src/target/target/stm32.cfg b/src/target/target/stm32.cfg
index fedafd14..1c80679e 100644
--- a/src/target/target/stm32.cfg
+++ b/src/target/target/stm32.cfg
@@ -14,12 +14,9 @@ reset_config trst_and_srst
 jtag_device 4 0x1 0xf 0xe
 jtag_device 5 0x1 0x1 0x1e
 
-#target <type> <startup mode>
-#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
-target cortex_m3 little 0
+target create target0 cortex_m3 -endian little -chain-position 0
 
-
-working_area 0 0x20000000 16384 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 16384 -work-area-backup 0
 
 #flash bank str7x <base> <size> 0 0 <target#> <variant>
 flash bank stm32x 0 0 0 0 0
diff --git a/src/target/target/stm32stick.cfg b/src/target/target/stm32stick.cfg
index f3e4006d..00964ab5 100644
--- a/src/target/target/stm32stick.cfg
+++ b/src/target/target/stm32stick.cfg
@@ -15,12 +15,9 @@ jtag_device 4 0x1 0xf 0xe
 jtag_device 5 0x1 0x1 0x1e
 jtag_device 4 0x1 0xf 0xe
 
-#target <type> <startup mode>
-#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
-target cortex_m3 little 0
+target create target0 cortex_m3 -endian little -chain-position 0
 
-
-working_area 0 0x20000000 16384 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 16384 -work-area-backup 0
 
 #flash bank str7x <base> <size> 0 0 <target#> <variant>
 flash bank stm32x 0 0 0 0 0
diff --git a/src/target/target/str710.cfg b/src/target/target/str710.cfg
index ea57e9f7..3273efdd 100644
--- a/src/target/target/str710.cfg
+++ b/src/target/target/str710.cfg
@@ -9,15 +9,11 @@ reset_config trst_and_srst srst_pulls_trst
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag_device 4 0x1 0xf 0xe
 
-#target <type> <startup mode>
-#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
-target arm7tdmi little 0 arm7tdmi
+target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
 [new_target_name] configure -event reset-start { jtag_khz 10 }
 [new_target_name] configure -event reset-init { jtag_khz 6000 }
 [new_target_name] configure -event old-gdb_program_config { script event/str710_program.script }
-
-
-working_area 0 0x2000C000 0x4000 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x2000C000 -work-area-size 0x4000 -work-area-backup 0
 
 #flash bank str7x <base> <size> 0 0 <target#> <variant>
 flash bank str7x 0x40000000 0x00040000 0 0 0 STR71x
diff --git a/src/target/target/str730.cfg b/src/target/target/str730.cfg
index 2851befb..b36387aa 100644
--- a/src/target/target/str730.cfg
+++ b/src/target/target/str730.cfg
@@ -16,12 +16,11 @@ jtag_device 4 0x1 0xf 0xe
 jtag_nsrst_delay 500
 jtag_ntrst_delay 500
 
-target arm7tdmi little 0 arm7tdmi
+target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
 [new_target_name] configure -event reset-start { jtag_khz 10 }
 [new_target_name] configure -event reset-init { jtag_khz 3000 }
 [new_target_name] configure -event old-gdb_program_config { script event/str730_program.script }
-
-working_area 0 0x40000000 0x4000 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0
 
 #flash bank <driver> <base> <size> <chip_width> <bus_width>
 flash bank str7x 0x20000000 0x00040000 0 0 0 STR3x
diff --git a/src/target/target/str750.cfg b/src/target/target/str750.cfg
index d5fa45e8..6c69bb39 100644
--- a/src/target/target/str750.cfg
+++ b/src/target/target/str750.cfg
@@ -16,15 +16,12 @@ jtag_device 4 0x1 0xf 0xe
 jtag_nsrst_delay 500
 jtag_ntrst_delay 500
 
-#target <type> <startup mode>
-#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
-target arm7tdmi little 0 arm7tdmi
+target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
 
 [new_target_name] configure -event reset-start  { jtag_khz 10 }
 [new_target_name] configure -event reset-init { jtag_khz 3000 }
 [new_target_name] configure -event old-gdb_program_config { script event/str750_program.script }
-
-working_area 0 0x40000000 0x4000 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0
 
 #flash bank <driver> <base> <size> <chip_width> <bus_width>
 flash bank str7x 0x20000000 0x00040000 0 0 0 STR75x
diff --git a/src/target/target/str912.cfg b/src/target/target/str912.cfg
index cd0ec11c..6f605b06 100644
--- a/src/target/target/str912.cfg
+++ b/src/target/target/str912.cfg
@@ -17,9 +17,7 @@ jtag_device 8 0x1 0x1 0xfe
 jtag_device 4 0x1 0xf 0xe
 jtag_device 5 0x1 0x1 0x1e
 
-#target <type> <startup mode>
-#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
-target arm966e little 1 arm966e
+target create target0 arm966e -endian little -chain-position 1 -variant arm966e
 
 [new_target_name] configure -event reset-start { jtag_rclk 16 }
 
@@ -35,9 +33,7 @@ target arm966e little 1 arm966e
 	flash protect 0 0 7 off
 }
 
-
-
-working_area 0 0x50000000 16384 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x50000000 -work-area-size 16384 -work-area-backup 0
 
 #flash bank str9x <base> <size> 0 0 <target#> <variant>
 flash bank str9x 0x00000000 0x00080000 0 0 0
diff --git a/src/target/target/str9comstick.cfg b/src/target/target/str9comstick.cfg
index f9dbe01c..b9b5fc75 100644
--- a/src/target/target/str9comstick.cfg
+++ b/src/target/target/str9comstick.cfg
@@ -12,8 +12,8 @@ reset_config trst_and_srst
 jtag_device 8 0x1 0x1 0xfe
 jtag_device 4 0x1 0xf 0xe
 jtag_device 5 0x1 0x1 0x1e
-target arm966e little 1 arm966e
+target create target0 arm966e -endian little -chain-position 1 -variant arm966e
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x50000000 -work-area-size 16384 -work-area-backup 0
 
-working_area 0 0x50000000 16384 nobackup
 #flash bank <driver> <base> <size> <chip_width> <bus_width>
 flash bank str9x 0x00000000 0x00080000 0 0 0
diff --git a/src/target/target/test_reset_syntax_error.cfg b/src/target/target/test_reset_syntax_error.cfg
index 1f6b0e92..b720ca9d 100644
--- a/src/target/target/test_reset_syntax_error.cfg
+++ b/src/target/target/test_reset_syntax_error.cfg
@@ -7,7 +7,7 @@
 jtag_device 4 0x1 0xf 0xe
 
 #target configuration
-target arm7tdmi little 0 arm7tdmi-s_r4
+target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi-s_r4
 
 [new_target_name] configure -event reset-init { 
 
diff --git a/src/target/target/test_syntax_error.cfg b/src/target/target/test_syntax_error.cfg
index 63713d1c..8727aa36 100644
--- a/src/target/target/test_syntax_error.cfg
+++ b/src/target/target/test_syntax_error.cfg
@@ -1,4 +1,4 @@
 # This script tests a syntax error in the startup 
 # config script
 
-syntax error here
\ No newline at end of file
+syntax error here
diff --git a/src/target/target/wi-9c.cfg b/src/target/target/wi-9c.cfg
index 71acf0fc..7277108e 100644
--- a/src/target/target/wi-9c.cfg
+++ b/src/target/target/wi-9c.cfg
@@ -14,15 +14,9 @@ jtag_ntrst_delay 0
 # Target configuration
 ######################
 
-#target <type> <endianess> <reset mode> <JTAG pos> <variant>
-target arm926ejs big 0 arm926ejs
-
+target create target0 arm926ejs -endian big -chain-position 0 -variant arm926ejs
 [new_target_name] configure -event reset-init { script event/wi-9c_reset.script }
-
-
-#working area <target#> <address> <size> <backup|nobackup>
-working_area 0 0x00000000 0x1000 backup
-
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x00000000 -work-area-size 0x1000 -work-area-backup 1
 
 #####################
 # Flash configuration
diff --git a/src/target/target/xba_revA3.cfg b/src/target/target/xba_revA3.cfg
index 4c750b5b..2fd44a92 100644
--- a/src/target/target/xba_revA3.cfg
+++ b/src/target/target/xba_revA3.cfg
@@ -9,12 +9,12 @@ jtag_ntrst_delay 100
 #format L IRC IRCM IDCODE (Length, IR Capture, IR capture Mask, IDCODE)
 jtag_device 7 0x1 0x7f 0x7e
 
-target  xscale big           0          ixp42x
+target create target0 xscale -endian big -chain-position 0 -variant ixp42x
 [new_target_name] configure -event reset-init { script event/xba_revA3.script }
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x20010000 -work-area-size 0x8060 -work-area-backup 0
 
 
 flash bank cfi 0x50000000 0x400000 2 2 0
-working_area 0 0x20010000 0x8060 nobackup
 
 init 
 reset init
diff --git a/src/target/target/zy1000.cfg b/src/target/target/zy1000.cfg
index b47607f1..2fb2db32 100644
--- a/src/target/target/zy1000.cfg
+++ b/src/target/target/zy1000.cfg
@@ -13,8 +13,7 @@ reset_config srst_only srst_pulls_trst
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag_device 4 0x1 0xf 0xe
 
-#target configuration
-target arm7tdmi little 0 arm7tdmi-s_r4
+target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi-s_r4
 
 # at CPU CLK <32kHz this must be disabled
 arm7_9 fast_memory_access enable
@@ -45,7 +44,7 @@ flash bank ecosflash 0x01000000 0x200000 2 2 0 ecos/at91eb40a.elf
 
 # required for usable performance. Used for lots of
 # other things than flash programming.
-working_area 0 0x00020000 0x20000 nobackup
+[new_target_name] configure -work-area-virt 0 -work-area-phys 0x00020000 -work-area-size 0x20000 -work-area-backup 0
 
 jtag_khz 16000
 
@@ -89,4 +88,4 @@ proc production_test {} {
 	sleep 25000
 	target_request debugmsgs disable
 	return "See IP address above..."
-}
\ No newline at end of file
+}