TCL scripts: update to current "flash bank" syntax

[openocd.git] / tcl / board / digi_connectcore_wi-9c.cfg

diff --git a/tcl/board/digi_connectcore_wi-9c.cfg b/tcl/board/digi_connectcore_wi-9c.cfg
index 93317327586ff9872d969db8939cdf57f5f1ca36..096af1b66d67c05e823b3effb836e1d8d1153f0b 100644 (file)
--- a/tcl/board/digi_connectcore_wi-9c.cfg
+++ b/tcl/board/digi_connectcore_wi-9c.cfg
@@ -4,15 +4,19 @@
 
 reset_config trst_and_srst
 
-if { [info exists CHIPNAME] } {        
-   set  _CHIPNAME $CHIPNAME    
-} else {        
+# FIXME use some standard target config, maybe create one from this
+#
+#      source [find target/...cfg]
+
+if { [info exists CHIPNAME] } {
+   set  _CHIPNAME $CHIPNAME
+} else {
    set  _CHIPNAME ns9360
 }
 
-if { [info exists ENDIAN] } {  
-   set  _ENDIAN $ENDIAN    
-} else {        
+if { [info exists ENDIAN] } {
+   set  _ENDIAN $ENDIAN
+} else {
   # This config file was defaulting to big endian..
    set  _ENDIAN big
 }
@@ -26,13 +30,13 @@ jtag_rclk 1000
 if { [info exists CPUTAPID ] } {
    set _CPUTAPID $CPUTAPID
 } else {
-   set _CPUTAPID 0xFFFFFFFF
+   set _CPUTAPID 0x07926031
 }
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
-jtag_nsrst_delay 200
+adapter_nsrst_delay 200
 jtag_ntrst_delay 0
 
 
@@ -40,22 +44,23 @@ jtag_ntrst_delay 0
 # Target configuration
 ######################
 
-target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs
+target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME
+
 $_TARGETNAME configure -event reset-init {
        mww 0x90600104 0x33313333
        mww 0xA0700000 0x00000001  # Enable the memory controller.
        mww 0xA0700024 0x00000006  # Set the refresh counter 6
-       mww 0xA0700028 0x00000001  # 
+       mww 0xA0700028 0x00000001  #
        mww 0xA0700030 0x00000001  # Set the precharge period
        mww 0xA0700034 0x00000004  # Active to precharge command period is 16 clock cycles
        mww 0xA070003C 0x00000001  # tAPR
        mww 0xA0700040 0x00000005  # tDAL
        mww 0xA0700044 0x00000001  # tWR
-       mww 0xA0700048 0x00000006  # tRC 32 clock cycles  
+       mww 0xA0700048 0x00000006  # tRC 32 clock cycles
        mww 0xA070004C 0x00000006  # tRFC 32 clock cycles
        mww 0xA0700054 0x00000001  # tRRD
        mww 0xA0700058 0x00000001  # tMRD
-       mww 0xA0700100 0x00004280  # Dynamic Config 0 (cs4) 
+       mww 0xA0700100 0x00004280  # Dynamic Config 0 (cs4)
        mww 0xA0700120 0x00004280  # Dynamic Config 1 (cs5)
        mww 0xA0700140 0x00004280  # Dynamic Config 2 (cs6)
        mww 0xA0700160 0x00004280  # Dynamic Config 3 (cs7)
@@ -78,11 +83,11 @@ $_TARGETNAME configure -event reset-init {
        mww 0xA0900000 0x00000002
        mww 0xA0900000 0x00000002
        #
-       mdw 0xA0900000 
-       mdw 0xA0900000 
-       mdw 0xA0900000 
-       mdw 0xA0900000 
-       mdw 0xA0900000 
+       mdw 0xA0900000
+       mdw 0xA0900000
+       mdw 0xA0900000
+       mdw 0xA0900000
+       mdw 0xA0900000
        #
        mww 0xA0700024 0x00000030 # Set the refresh counter to 30
        mww 0xA0700020 0x00000083 # Issue SDRAM MODE command
@@ -99,12 +104,12 @@ $_TARGETNAME configure -event reset-init {
        mww 0xA0700160 0x00084280   # Enable buffer access
 
        #Set byte lane state (static mem 1)"
-       mww 0xA0700220, 0x00000082
+       mww 0xA0700220 0x00000082
        #Flash Start
-       mww 0xA09001F8, 0x50000000
+       mww 0xA09001F8 0x50000000
        #Flash Mask Reg
-       mww 0xA09001FC, 0xFF000001
-       mww 0xA0700028, 0x00000001
+       mww 0xA09001FC 0xFF000001
+       mww 0xA0700028 0x00000001
 
        #  RAMAddr = 0x00020000
        #  RAMSize = 0x00004000
@@ -113,15 +118,13 @@ $_TARGETNAME configure -event reset-init {
        reg cpsr 0xd3
 }
 
-$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x00000000 -work-area-size 0x1000 -work-area-backup 1
+$_TARGETNAME configure -work-area-phys 0x00000000 -work-area-size 0x1000 -work-area-backup 1
 
 #####################
 # Flash configuration
 #####################
 
 #M29DW323DB - not working
-#flash bank cfi <base> <size> <chip width> <bus width> <target#>
-flash bank cfi 0x50000000 0x0400000 2 2 0
-
-
-
+#flash bank <name> cfi <base> <size> <chip width> <bus width> <target>
+set _FLASHNAME $_CHIPNAME.flash
+flash bank $_FLASHNAME cfi 0x50000000 0x0400000 2 2 $_TARGETNAME