fix flash bank auto_probe() fail with multiple targets

[fw/openocd] / src / flash / startup.tcl

diff --git a/src/flash/startup.tcl b/src/flash/startup.tcl
index 2c335d9f7b1e0a73dc915bb86873244f841c5448..b8d280b8e75fb97e100da4c4f0ca19746720a602 100644 (file)
--- a/src/flash/startup.tcl
+++ b/src/flash/startup.tcl
@@ -1,16 +1,100 @@
 # Defines basic Tcl procs for OpenOCD flash module
 
-# Show flash in human readable form
-# This is an example of a human readable form of a low level fn
-proc flash_banks {} {
-       set i 0
-       set result ""
-       foreach {a} [ocd_flash banks] {
-               if {$i > 0} {
-                       set result "$result\n"
+#
+# program utility proc
+# usage: program filename
+# optional args: verify, reset and address
+#
+
+proc program {filename args} {
+
+       foreach arg $args {
+               if {[string equal $arg "verify"]} {
+                       set verify 1
+               } elseif {[string equal $arg "reset"]} {
+                       set reset 1
+               } else {
+                       set address $arg
+               }
+       }
+
+       # make sure init is called
+       if {[catch {init}] != 0} {
+               echo "** OpenOCD init Failed **"
+               shutdown
+               return
+       }
+
+       # reset target and call any init scripts
+       if {[catch {reset init}] != 0} {
+               echo "** Unable to reset target **"
+               shutdown
+               return
+       }
+
+       # start programming phase
+       echo "** Programming Started **"
+       if {[info exists address]} {
+               set flash_args "$filename $address"
+       } else {
+               set flash_args "$filename"
+       }
+
+       if {[catch {eval flash write_image erase $flash_args}] == 0} {
+               echo "** Programming Finished **"
+               if {[info exists verify]} {
+                       # verify phase
+                       echo "** Verify Started **"
+                       if {[catch {eval verify_image $flash_args}] == 0} {
+                               echo "** Verified OK **"
+                       } else {
+                               echo "** Verify Failed **"
+                       }
+               }
+
+               if {[info exists reset]} {
+                       # reset target if requested
+                       # also disable target polling, we are shutting down anyway
+                       poll off
+                       echo "** Resetting Target **"
+                       reset run
                }
-               set result [format "$result#%d: %s at 0x%08x, size 0x%08x, buswidth %d, chipwidth %d" $i $a(name) $a(base) $a(size) $a(bus_width) $a(chip_width)]
-               set i [expr $i+1]
+       } else {
+               echo "** Programming Failed **"
        }
-       return $result
+
+       # shutdown OpenOCD
+       shutdown
+}
+
+add_help_text program "write an image to flash, address is only required for binary images. verify, reset are optional"
+add_usage_text program "<filename> \[address\] \[verify\] \[reset\]"
+
+# stm32f0x uses the same flash driver as the stm32f1x
+# this alias enables the use of either name.
+proc stm32f0x args {
+       eval stm32f1x $args
+}
+
+# stm32f3x uses the same flash driver as the stm32f1x
+# this alias enables the use of either name.
+proc stm32f3x args {
+       eval stm32f1x $args
+}
+
+# stm32f4x uses the same flash driver as the stm32f2x
+# this alias enables the use of either name.
+proc stm32f4x args {
+       eval stm32f2x $args
+}
+
+# ease migration to updated flash driver
+proc stm32x args {
+       echo "DEPRECATED! use 'stm32f1x $args' not 'stm32x $args'"
+       eval stm32f1x $args
+}
+
+proc stm32f2xxx args {
+       echo "DEPRECATED! use 'stm32f2x $args' not 'stm32f2xxx $args'"
+       eval stm32f2x $args
 }