Hi,
reviewing the "cfi" driver I have found inconsistencies in tcl scripts.
The patch in attachment addresses such issues, but I have no
possibility to test any of the modified script.
So, please review the patch, or directly discard it.
The syntax for "flash bank" command has been changed long ago, but
several tcl script are still not fully update.
Fix following cases related with "cfi" driver:
- syntax error: the mandatory <name> parameter is missing
- warning: the <target> parameter is a number, instead of the target name
- the comment line above the command does not report actual syntax
File modified are:
tcl/board/at91rm9200-dk.cfg | 5 +++--
tcl/board/balloon3-cpu.cfg | 4 ++--
tcl/board/digi_connectcore_wi-9c.cfg | 4 ++--
tcl/board/dm6446evm.cfg | 3 ++-
tcl/board/hammer.cfg | 4 ++--
tcl/board/imx27ads.cfg | 3 ++-
tcl/board/logicpd_imx27.cfg | 3 ++-
tcl/board/topas910.cfg | 4 ++--
tcl/board/topasa900.cfg | 4 ++--
tcl/board/unknown_at91sam9260.cfg | 4 ++--
tcl/board/x300t.cfg | 4 ++--
tcl/target/at91sam9260_ext_RAM_ext_flash.cfg | 2 +-
Best Regards
Antonio Borneo
From 4a686277afbb68045cee81326b61ebe38c32553d Mon Sep 17 00:00:00 2001
From: Antonio Borneo <borneo.anto...@gmail.com>
Date: Fri, 26 Mar 2010 15:17:46 +0800
Subject: [PATCH] TCL scripts: update to current "flash bank" syntax
While "flash bank" syntax has been changed long ago,
several tcl script are still not fully update.
Fix following cases related with "cfi" driver:
- syntax error: the mandatory <name> parameter is missing
- warning: the <target> parameter is a number, instead of
the target name
- the comment line above the command does not report
actual syntax
Signed-off-by: Antonio Borneo <borneo.anto...@gmail.com>
---
tcl/board/at91rm9200-dk.cfg | 5 +++--
tcl/board/balloon3-cpu.cfg | 4 ++--
tcl/board/digi_connectcore_wi-9c.cfg | 4 ++--
tcl/board/dm6446evm.cfg | 3 ++-
tcl/board/hammer.cfg | 4 ++--
tcl/board/imx27ads.cfg | 3 ++-
tcl/board/logicpd_imx27.cfg | 3 ++-
tcl/board/topas910.cfg | 4 ++--
tcl/board/topasa900.cfg | 4 ++--
tcl/board/unknown_at91sam9260.cfg | 4 ++--
tcl/board/x300t.cfg | 4 ++--
tcl/target/at91sam9260_ext_RAM_ext_flash.cfg | 2 +-
12 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/tcl/board/at91rm9200-dk.cfg b/tcl/board/at91rm9200-dk.cfg
index 476f5a8..af6e3df 100644
--- a/tcl/board/at91rm9200-dk.cfg
+++ b/tcl/board/at91rm9200-dk.cfg
@@ -8,8 +8,9 @@ source [find target/at91rm9200.cfg]
$_TARGETNAME configure -event gdb-attach { reset init }
$_TARGETNAME configure -event reset-init { at91rm9200_dk_init }
-#flash bank <driver> <base> <size> <chip_width> <bus_width>
-flash_bank cfi 0x10000000 0x00200000 2 2 0
+#flash bank <name> <driver> <base> <size> <chip_width> <bus_width> <target>
+set _FLASHNAME $_CHIPNAME.flash
+flash_bank $_FLASHNAME cfi 0x10000000 0x00200000 2 2 $_TARGETNAME
proc at91rm9200_dk_init { } {
diff --git a/tcl/board/balloon3-cpu.cfg b/tcl/board/balloon3-cpu.cfg
index ecb1a28..468b867 100644
--- a/tcl/board/balloon3-cpu.cfg
+++ b/tcl/board/balloon3-cpu.cfg
@@ -8,7 +8,7 @@ source [find target/pxa270.cfg]
# Override this in the interface config for parallel dongles
reset_config trst_and_srst separate
-# flash bank <driver> <base> <size> <chip_width> <bus_width>
+# flash bank <name> <driver> <base> <size> <chip_width> <bus_width> <target>
# 29LV650 64Mbit Flash
set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME cfi 0x00000000 0x800000 2 2 0
+flash bank $_FLASHNAME cfi 0x00000000 0x800000 2 2 $_TARGETNAME
diff --git a/tcl/board/digi_connectcore_wi-9c.cfg b/tcl/board/digi_connectcore_wi-9c.cfg
index ad40d53..096af1b 100644
--- a/tcl/board/digi_connectcore_wi-9c.cfg
+++ b/tcl/board/digi_connectcore_wi-9c.cfg
@@ -125,6 +125,6 @@ $_TARGETNAME configure -work-area-phys 0x00000000 -work-area-size 0x1000 -work-a
#####################
#M29DW323DB - not working
-#flash bank cfi <base> <size> <chip width> <bus width> <target#>
+#flash bank <name> cfi <base> <size> <chip width> <bus width> <target>
set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME cfi 0x50000000 0x0400000 2 2 0
+flash bank $_FLASHNAME cfi 0x50000000 0x0400000 2 2 $_TARGETNAME
diff --git a/tcl/board/dm6446evm.cfg b/tcl/board/dm6446evm.cfg
index 39607fe..dcd1c4e 100644
--- a/tcl/board/dm6446evm.cfg
+++ b/tcl/board/dm6446evm.cfg
@@ -31,7 +31,8 @@ if { [info exists J4_OPTION] } {
if { $CS2_MODE == "NOR" } {
# 16 Mbytes address space; 16 bit bus width
# (older boards used 32MB parts, with upper 16 MB unusable)
- flash bank cfi 0x02000000 0x01000000 2 2 $_TARGETNAME
+ set _FLASHNAME $_CHIPNAME.flash
+ flash bank $_FLASHNAME cfi 0x02000000 0x01000000 2 2 $_TARGETNAME
proc flashprobe {} { flash probe 0 }
} elseif { $CS2_MODE == "NAND" } {
# 64 Mbyte small page; 8 bit bus width
diff --git a/tcl/board/hammer.cfg b/tcl/board/hammer.cfg
index d366a45..ea3da81 100644
--- a/tcl/board/hammer.cfg
+++ b/tcl/board/hammer.cfg
@@ -32,6 +32,6 @@ $_TARGETNAME configure -event reset-init {
#flash configuration
-#flash bank <driver> <base> <size> <chip_width> <bus_width> [driver_options ...]
+#flash bank <name> <driver> <base> <size> <chip_width> <bus_width> <target> [driver_options ...]
set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME cfi 0x00000000 0x1000000 2 2 0
+flash bank $_FLASHNAME cfi 0x00000000 0x1000000 2 2 $_TARGETNAME
diff --git a/tcl/board/imx27ads.cfg b/tcl/board/imx27ads.cfg
index 664b470..927647a 100644
--- a/tcl/board/imx27ads.cfg
+++ b/tcl/board/imx27ads.cfg
@@ -5,7 +5,8 @@ $_TARGETNAME configure -event gdb-attach { reset init }
$_TARGETNAME configure -event reset-init { imx27ads_init }
# The IMX27 ADS board has a NOR flash on CS0
-flash_bank cfi 0xc0000000 0x00200000 2 2 0
+set _FLASHNAME $_CHIPNAME.flash
+flash_bank $_FLASHNAME cfi 0xc0000000 0x00200000 2 2 $_TARGETNAME
proc imx27ads_init { } {
# This setup puts RAM at 0xA0000000
diff --git a/tcl/board/logicpd_imx27.cfg b/tcl/board/logicpd_imx27.cfg
index b068f1a..02afc77 100644
--- a/tcl/board/logicpd_imx27.cfg
+++ b/tcl/board/logicpd_imx27.cfg
@@ -2,7 +2,8 @@
source [find target/imx27.cfg]
# The Logic PD board has a NOR flash on CS0
-flash_bank cfi 0xc0000000 0x00200000 2 2 0
+set _FLASHNAME $_CHIPNAME.flash
+flash_bank $_FLASHNAME cfi 0xc0000000 0x00200000 2 2 $_TARGETNAME
#
# FIX ME, Add support to
diff --git a/tcl/board/topas910.cfg b/tcl/board/topas910.cfg
index 303fc77..333b016 100644
--- a/tcl/board/topas910.cfg
+++ b/tcl/board/topas910.cfg
@@ -114,6 +114,6 @@ arm7_9 dcc_downloads enable # Enable faster DCC downloads
# Flash configuration
#####################
-#flash bank cfi <base> <size> <chip width> <bus width> <target#>
+#flash bank <name> cfi <base> <size> <chip width> <bus width> <target>
set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME cfi 0x20000000 0x2000000 2 2 0
+flash bank $_FLASHNAME cfi 0x20000000 0x2000000 2 2 $_TARGETNAME
diff --git a/tcl/board/topasa900.cfg b/tcl/board/topasa900.cfg
index aa3f77f..065cd31 100644
--- a/tcl/board/topasa900.cfg
+++ b/tcl/board/topasa900.cfg
@@ -120,7 +120,7 @@ arm7_9 dcc_downloads enable # Enable faster DCC downloads
# Flash configuration
#####################
-#flash bank cfi <base> <size> <chip width> <bus width> <target#>
+#flash bank <name> cfi <base> <size> <chip width> <bus width> <target>
set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME cfi 0x20000000 0x1000000 2 2 0
+flash bank $_FLASHNAME cfi 0x20000000 0x1000000 2 2 $_TARGETNAME
diff --git a/tcl/board/unknown_at91sam9260.cfg b/tcl/board/unknown_at91sam9260.cfg
index ad7b13c..845de6b 100644
--- a/tcl/board/unknown_at91sam9260.cfg
+++ b/tcl/board/unknown_at91sam9260.cfg
@@ -90,8 +90,8 @@ $_TARGETNAME configure -event reset-init {
# Flash configuration
#####################
-#flash bank cfi <base> <size> <chip width> <bus width> <target#>
+#flash bank <name> cfi <base> <size> <chip width> <bus width> <target>
set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME cfi 0x10000000 0x01000000 2 2 0
+flash bank $_FLASHNAME cfi 0x10000000 0x01000000 2 2 $_TARGETNAME
diff --git a/tcl/board/x300t.cfg b/tcl/board/x300t.cfg
index d914180..9d9a320 100644
--- a/tcl/board/x300t.cfg
+++ b/tcl/board/x300t.cfg
@@ -7,9 +7,9 @@ source [find target/smp8634.cfg]
$_TARGETNAME configure -event reset-init { x300t_init }
# 1MB CFI capable flash
-# flash bank <driver> <base> <size> <chip_width> <bus_width>
+# flash bank <name> <driver> <base> <size> <chip_width> <bus_width> <target>
set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME cfi 0xac000000 0x100000 2 2 0
+flash bank $_FLASHNAME cfi 0xac000000 0x100000 2 2 $_TARGETNAME
proc x300t_init { } {
# Setup SDRAM config and flash mapping
diff --git a/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg b/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg
index 034a348..d2bf66f 100644
--- a/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg
+++ b/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg
@@ -54,7 +54,7 @@ $_TARGETNAME configure -event reset-deassert-post {at91sam_init}
# Flash configuration
-#flash bank cfi <base> <size> <chip width> <bus width> <target#>
+#flash bank <name> cfi <base> <size> <chip width> <bus width> <target>
set _FLASHNAME $_CHIPNAME.flash
flash bank $_FLASHNAME cfi 0x10000000 0x01000000 2 2 $_TARGETNAME
--
1.5.2.2
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
