From 0da0bfd40a0ba46a68a6b9db428700241d2700b1 Mon Sep 17 00:00:00 2001 From: Freddie Chopin Date: Thu, 29 Oct 2009 19:23:05 +0100 Subject: [PATCH] target.cfg: use $_TARGETNAME for flash This gets rid of runtime warnings from the use of numbers. STM32 and LPC2103 were tested. Other LPC updates are the same, and so are safe. The CFI updates match other tested changes now in the tree. Signed-off-by: David Brownell --- tcl/target/at91r40008.cfg | 2 +- tcl/target/epc9301.cfg | 2 +- tcl/target/lpc1768.cfg | 2 +- tcl/target/lpc2103.cfg | 2 +- tcl/target/lpc2124.cfg | 2 +- tcl/target/lpc2129.cfg | 2 +- tcl/target/lpc2148.cfg | 2 +- tcl/target/lpc2294.cfg | 2 +- tcl/target/lpc2378.cfg | 2 +- tcl/target/lpc2478.cfg | 2 +- tcl/target/smdk6410.cfg | 2 +- tcl/target/stm32.cfg | 2 +- tcl/target/xba_revA3.cfg | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tcl/target/at91r40008.cfg b/tcl/target/at91r40008.cfg index fe755b4d96..eb6cabaa28 100644 --- a/tcl/target/at91r40008.cfg +++ b/tcl/target/at91r40008.cfg @@ -45,7 +45,7 @@ $_TARGETNAME configure -event gdb-flash-erase-start { $_TARGETNAME 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 +flash bank cfi 0x10000000 0x400000 2 2 $_TARGETNAME # For more information about the configuration files, take a look at: # openocd.texi diff --git a/tcl/target/epc9301.cfg b/tcl/target/epc9301.cfg index f3fe7eb1c0..2b4155fbc6 100644 --- a/tcl/target/epc9301.cfg +++ b/tcl/target/epc9301.cfg @@ -28,4 +28,4 @@ target create $_TARGETNAME arm920t -endian $_ENDIAN -chain-position $_TARGETNAME #flash configuration #flash bank [driver_options ...] -flash bank cfi 0x60000000 0x1000000 2 2 0 +flash bank cfi 0x60000000 0x1000000 2 2 $_TARGETNAME diff --git a/tcl/target/lpc1768.cfg b/tcl/target/lpc1768.cfg index fbf7117cae..63ec1bb32d 100644 --- a/tcl/target/lpc1768.cfg +++ b/tcl/target/lpc1768.cfg @@ -44,7 +44,7 @@ $_TARGETNAME configure -event reset-init { # LPC1768 has 512kB of user-available FLASH (bootloader is located in separate dedicated region). # flash bank lpc1700 0 0 [calc_checksum] -flash bank lpc2000 0x0 0x80000 0 0 0 lpc1700 12000 calc_checksum +flash bank lpc2000 0x0 0x80000 0 0 $_TARGETNAME lpc1700 12000 calc_checksum # 4MHz / 6 = 666kHz, so use 500 jtag_khz 500 diff --git a/tcl/target/lpc2103.cfg b/tcl/target/lpc2103.cfg index 899ca23710..1a88076190 100644 --- a/tcl/target/lpc2103.cfg +++ b/tcl/target/lpc2103.cfg @@ -35,4 +35,4 @@ $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-s # 32kB of internal Flash, core clocked with 12MHz crystal # flash bank lpc2000 0 0 [calc_checksum] -flash bank lpc2000 0x0 0x8000 0 0 0 lpc2000_v2 12000 calc_checksum +flash bank lpc2000 0x0 0x8000 0 0 $_TARGETNAME lpc2000_v2 12000 calc_checksum diff --git a/tcl/target/lpc2124.cfg b/tcl/target/lpc2124.cfg index 9430c1b04b..61d411b568 100644 --- a/tcl/target/lpc2124.cfg +++ b/tcl/target/lpc2124.cfg @@ -39,4 +39,4 @@ $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-s #flash bank -flash bank lpc2000 0x0 0x40000 0 0 0 lpc2000_v1 14745 calc_checksum +flash bank lpc2000 0x0 0x40000 0 0 $_TARGETNAME lpc2000_v1 14745 calc_checksum diff --git a/tcl/target/lpc2129.cfg b/tcl/target/lpc2129.cfg index daaa8d560b..5438fc3cd9 100644 --- a/tcl/target/lpc2129.cfg +++ b/tcl/target/lpc2129.cfg @@ -38,4 +38,4 @@ target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAM $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0 #flash bank -flash bank lpc2000 0x0 0x40000 0 0 0 lpc2000_v1 14765 calc_checksum +flash bank lpc2000 0x0 0x40000 0 0 $_TARGETNAME lpc2000_v1 14765 calc_checksum diff --git a/tcl/target/lpc2148.cfg b/tcl/target/lpc2148.cfg index e70947fe9c..b5023437b1 100644 --- a/tcl/target/lpc2148.cfg +++ b/tcl/target/lpc2148.cfg @@ -52,4 +52,4 @@ $_TARGETNAME configure -event reset-init { } # flash bank lpc2000 0 0 [calc_checksum] -flash bank lpc2000 0x0 0x7d000 0 0 0 lpc2000_v2 14765 calc_checksum +flash bank lpc2000 0x0 0x7d000 0 0 $_TARGETNAME lpc2000_v2 14765 calc_checksum diff --git a/tcl/target/lpc2294.cfg b/tcl/target/lpc2294.cfg index 399b11dfb7..08fbf58190 100644 --- a/tcl/target/lpc2294.cfg +++ b/tcl/target/lpc2294.cfg @@ -32,7 +32,7 @@ $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-s #flash configuration #flash bank lpc2000 0 0 -flash bank lpc2000 0x0 0x40000 0 0 0 lpc2000_v1 14765 calc_checksum +flash bank lpc2000 0x0 0x40000 0 0 $_TARGETNAME lpc2000_v1 14765 calc_checksum # For more information about the configuration files, take a look at: # openocd.texi diff --git a/tcl/target/lpc2378.cfg b/tcl/target/lpc2378.cfg index d34ffae66d..34b9963f93 100644 --- a/tcl/target/lpc2378.cfg +++ b/tcl/target/lpc2378.cfg @@ -43,7 +43,7 @@ $_TARGETNAME configure -event reset-init { # LPC2378 has 512kB of FLASH, but upper 8kB are occupied by bootloader. # After reset the chip uses its internal 4MHz RC oscillator #flash bank lpc2000 0 0 -flash bank lpc2000 0x0 0x0007D000 0 0 0 lpc2000_v2 4000 calc_checksum +flash bank lpc2000 0x0 0x0007D000 0 0 $_TARGETNAME lpc2000_v2 4000 calc_checksum # 4MHz / 6 = 666kHz, so use 500 jtag_khz 500 diff --git a/tcl/target/lpc2478.cfg b/tcl/target/lpc2478.cfg index 1d2058b044..bf33ae0e04 100644 --- a/tcl/target/lpc2478.cfg +++ b/tcl/target/lpc2478.cfg @@ -43,7 +43,7 @@ $_TARGETNAME configure -event reset-init { # LPC2378 has 512kB of FLASH, but upper 8kB are occupied by bootloader. # After reset the chip uses its internal 4MHz RC oscillator. # flash bank lpc2000 0 0 [calc checksum] -flash bank lpc2000 0x0 0x7D000 0 0 0 lpc2000_v2 12000 calc_checksum +flash bank lpc2000 0x0 0x7D000 0 0 $_TARGETNAME lpc2000_v2 12000 calc_checksum # Try to use RCLK, if RCLK is not available use "normal" mode. 4MHz / 6 = 666kHz, so use 500. jtag_rclk 500 diff --git a/tcl/target/smdk6410.cfg b/tcl/target/smdk6410.cfg index 6ce07caede..7f15f8b876 100644 --- a/tcl/target/smdk6410.cfg +++ b/tcl/target/smdk6410.cfg @@ -5,4 +5,4 @@ source [find target/samsung_s3c6410.cfg] -flash bank cfi 0x00000000 0x00100000 2 2 0 jedec_probe \ No newline at end of file +flash bank cfi 0x00000000 0x00100000 2 2 $_TARGETNAME jedec_probe diff --git a/tcl/target/stm32.cfg b/tcl/target/stm32.cfg index a37e73341c..b5a86527e7 100644 --- a/tcl/target/stm32.cfg +++ b/tcl/target/stm32.cfg @@ -62,7 +62,7 @@ target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNA $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0 -flash bank stm32x 0 0 0 0 0 +flash bank stm32x 0 0 0 0 $_TARGETNAME # For more information about the configuration files, take a look at: # openocd.texi diff --git a/tcl/target/xba_revA3.cfg b/tcl/target/xba_revA3.cfg index 0595fa1612..e1c8870556 100644 --- a/tcl/target/xba_revA3.cfg +++ b/tcl/target/xba_revA3.cfg @@ -79,7 +79,7 @@ $_TARGETNAME configure -event reset-init { $_TARGETNAME 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 +flash bank cfi 0x50000000 0x400000 2 2 $_TARGETNAME init reset init -- 2.30.2