scripts: update flash bank names

As the flash bank name is now unique update the scripts to suit.

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>

diff --git a/tcl/board/hitex_str9-comstick.cfg b/tcl/board/hitex_str9-comstick.cfg
index 4d1bb2e412a6879ad451d709ddeafcb8c3d07cfa..c85681b186ea4e4425f98241355dc59bcf29e17b 100644 (file)
--- a/tcl/board/hitex_str9-comstick.cfg
+++ b/tcl/board/hitex_str9-comstick.cfg
@@ -73,7 +73,7 @@ $_TARGETNAME configure -event reset-init {
 $_TARGETNAME configure -work-area-phys 0x50000000 -work-area-size 16384 -work-area-backup 0
 
 #flash bank <driver> <base> <size> <chip_width> <bus_width>
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash0
 flash bank $_FLASHNAME str9x 0x00000000 0x00080000 0 0 0
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash1
 flash bank $_FLASHNAME str9x 0x00080000 0x00008000 0 0 0

diff --git a/tcl/board/lubbock.cfg b/tcl/board/lubbock.cfg
index 095c60aacf09a5a54ed5119d28fedac8901687b8..b58ad5add4654cb3885846e74d96614b8c21d1f7 100644 (file)
--- a/tcl/board/lubbock.cfg
+++ b/tcl/board/lubbock.cfg
@@ -12,9 +12,9 @@ jtag_ntrst_delay 250
 
 # CS0, CS1 -- two banks of CFI flash, 32 MBytes each
 # each bank is 32-bits wide, two 16-bit chips in parallel
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash0
 flash bank $_FLASHNAME cfi 0x00000000 0x02000000 2 4 $_TARGETNAME
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash1
 flash bank $_FLASHNAME cfi 0x04000000 0x02000000 2 4 $_TARGETNAME
 
 # CS2 low -- FPGA registers

diff --git a/tcl/board/str910-eval.cfg b/tcl/board/str910-eval.cfg
index a2772a84de933568df52c30af3fb2fac5012b2ac..9e3f88108fb86a2a69493dabbf7452dfaf15ab31 100644 (file)
--- a/tcl/board/str910-eval.cfg
+++ b/tcl/board/str910-eval.cfg
@@ -58,9 +58,9 @@ $_TARGETNAME configure -event reset-init {
 }
 
 #flash bank str9x <base> <size> 0 0 <target#> <variant>
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash0
 flash bank $_FLASHNAME str9x 0x00000000 0x00080000 0 0 0
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash1
 flash bank $_FLASHNAME str9x 0x00080000 0x00008000 0 0 0
 
 # For more information about the configuration files, take a look at:

diff --git a/tcl/target/at91sam3u4c.cfg b/tcl/target/at91sam3u4c.cfg
index e281287070c9fba24cd10b41d5f593ddd1bc8bf6..5cacbcbef6f1068aa30bbc59de558a9641c7c43c 100644 (file)
--- a/tcl/target/at91sam3u4c.cfg
+++ b/tcl/target/at91sam3u4c.cfg
@@ -2,10 +2,10 @@
 source [find target/at91sam3uxx.cfg]
 
 # size is automatically "calculated" by probing
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash0
 flash bank $_FLASHNAME at91sam3 0x000080000 0 1 1 $_TARGETNAME
 # This is a 256K chip, it has the 2nd bank
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash1
 flash bank $_FLASHNAME at91sam3 0x000100000 0 1 1 $_TARGETNAME
 
 

diff --git a/tcl/target/at91sam3u4e.cfg b/tcl/target/at91sam3u4e.cfg
index e549185ae3d8800891163747c1dfd7c0d37bb390..6f6e0d873dd0bf8090379e3e804139249d2e5f74 100644 (file)
--- a/tcl/target/at91sam3u4e.cfg
+++ b/tcl/target/at91sam3u4e.cfg
@@ -2,10 +2,10 @@
 source [find target/at91sam3uXX.cfg]
 
 # size is automatically "calculated" by probing
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash0
 flash bank $_FLASHNAME at91sam3 0x000080000 0 1 1 $_TARGETNAME
 # This is a 256K chip - it has the 2nd bank
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash1
 flash bank $_FLASHNAME at91sam3 0x000100000 0 1 1 $_TARGETNAME
 
 

diff --git a/tcl/target/pic32mx.cfg b/tcl/target/pic32mx.cfg
index 673d254107c94a192dde8d40744b51014eae844d..0b99cdb47b2299b83d1595d8aa4b4c4db3239d47 100644 (file)
--- a/tcl/target/pic32mx.cfg
+++ b/tcl/target/pic32mx.cfg
@@ -67,9 +67,9 @@ $_TARGETNAME configure -event reset-init {
        mww 0xbf882030 $_PIC32MX_PROGSIZE
 }
 
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash0
 flash bank $_FLASHNAME pic32mx 0x1fc00000 0 0 0 $_TARGETNAME
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash1
 flash bank $_FLASHNAME pic32mx 0x1d000000 0 0 0 $_TARGETNAME
 
 # For more information about the configuration files, take a look at:

diff --git a/tcl/target/str710.cfg b/tcl/target/str710.cfg
index 4d685865c62f7041e2e458621d2d79bb98b53271..a5955b68c83d1857cd422bc7153383e8ab7fc659 100644 (file)
--- a/tcl/target/str710.cfg
+++ b/tcl/target/str710.cfg
@@ -47,9 +47,9 @@ $_TARGETNAME configure -event gdb-flash-erase-start {
 $_TARGETNAME configure -work-area-phys 0x2000C000 -work-area-size 0x4000 -work-area-backup 0
 
 #flash bank str7x <base> <size> 0 0 <target#> <variant>
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash0
 flash bank $_FLASHNAME str7x 0x40000000 0x00040000 0 0 $_TARGETNAME STR71x
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash1
 flash bank $_FLASHNAME str7x 0x400C0000 0x00004000 0 0 $_TARGETNAME STR71x
 
 # For more information about the configuration files, take a look at:

diff --git a/tcl/target/str750.cfg b/tcl/target/str750.cfg
index 8a6422614723d3ef38bd2cac8cad5a83da94bd8a..7d9f0343d105dfd9117f0382664fdc9711175a1e 100644 (file)
--- a/tcl/target/str750.cfg
+++ b/tcl/target/str750.cfg
@@ -53,8 +53,8 @@ $_TARGETNAME configure -event gdb-flash-erase-start {
 $_TARGETNAME configure -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0
 
 #flash bank <driver> <base> <size> <chip_width> <bus_width>
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash0
 flash bank $_FLASHNAME str7x 0x20000000 0x00040000 0 0 $_TARGETNAME STR75x
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash1
 flash bank $_FLASHNAME str7x 0x200C0000 0x00004000 0 0 $_TARGETNAME STR75x
 

diff --git a/tcl/target/str912.cfg b/tcl/target/str912.cfg
index 6f2981a1050155a979e583de9d692d7e03599bf5..a16c83a04e0acd9ff7057a92b7dd35e8d2fa9cf1 100644 (file)
--- a/tcl/target/str912.cfg
+++ b/tcl/target/str912.cfg
@@ -63,9 +63,9 @@ $_TARGETNAME configure -event reset-init {
 $_TARGETNAME configure -work-area-phys 0x50000000 -work-area-size 16384 -work-area-backup 0
 
 #flash bank str9x <base> <size> 0 0 <target#> <variant>
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash0
 flash bank $_FLASHNAME str9x 0x00000000 0x00080000 0 0 $_TARGETNAME
-set _FLASHNAME $_CHIPNAME.flash
+set _FLASHNAME $_CHIPNAME.flash1
 flash bank $_FLASHNAME str9x 0x00080000 0x00008000 0 0 $_TARGETNAME
 
 # For more information about the configuration files, take a look at: