cfg: allow stm32discovery parameter override

This enable the user or board config to override the parameters
passed to stm32_stlink.cfg.

Required to fix a incorrect working area bug with the stm32vldiscovery.

Change-Id: I40a4f7913ff37d577d44b1f23befccf0317080a1
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/597
Tested-by: jenkins
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>

diff --git a/tcl/target/stm32f0x_stlink.cfg b/tcl/target/stm32f0x_stlink.cfg
index 56da7ca6cbc4863aeddcafd19d06982b688af710..0c5c01098214414d60df6b35ffd9e1fd50ca87d2 100644 (file)
--- a/tcl/target/stm32f0x_stlink.cfg
+++ b/tcl/target/stm32f0x_stlink.cfg
@@ -2,9 +2,17 @@
 # STM32f0x stlink pseudo target
 #
 
-set CHIPNAME stm32f0x
-set CPUTAPID 0x0BB11477
-set WORKAREASIZE 0x400
+if { [info exists CHIPNAME] == 0 } {
+   set CHIPNAME stm32f0x
+}
+
+if { [info exists CPUTAPID] == 0 } {
+   set CPUTAPID 0x0bb11477
+}
+
+if { [info exists WORKAREASIZE] == 0 } {
+   set WORKAREASIZE 0x400
+}
 
 source [find target/stm32_stlink.cfg]
 

diff --git a/tcl/target/stm32f1x_stlink.cfg b/tcl/target/stm32f1x_stlink.cfg
index 67dfb7bca32808a66aa0e8dcaa4bc89ec923b469..9faaf6a0b34d5b7b4e11062f0f8834f4af32fe26 100644 (file)
--- a/tcl/target/stm32f1x_stlink.cfg
+++ b/tcl/target/stm32f1x_stlink.cfg
@@ -2,9 +2,17 @@
 # STM32f1x stlink pseudo target
 #
 
-set CHIPNAME stm32f1x
-set CPUTAPID 0x1ba01477
-set WORKAREASIZE 0x4000
+if { [info exists CHIPNAME] == 0 } {
+   set CHIPNAME stm32f1x
+}
+
+if { [info exists CPUTAPID] == 0 } {
+   set CPUTAPID 0x1ba01477
+}
+
+if { [info exists WORKAREASIZE] == 0 } {
+   set WORKAREASIZE 0x4000
+}
 
 source [find target/stm32_stlink.cfg]
 

diff --git a/tcl/target/stm32f2x_stlink.cfg b/tcl/target/stm32f2x_stlink.cfg
index 9c4e6fecdece6a42fe7763c638f071503ce8e65c..d46ae7c4a2c110bc356f72365690c240667e7fce 100644 (file)
--- a/tcl/target/stm32f2x_stlink.cfg
+++ b/tcl/target/stm32f2x_stlink.cfg
@@ -2,9 +2,17 @@
 # STM32f2x stlink pseudo target
 #
 
-set CHIPNAME stm32f2x
-set CPUTAPID 0x2ba01477
-set WORKAREASIZE 0x10000
+if { [info exists CHIPNAME] == 0 } {
+   set CHIPNAME stm32f2x
+}
+
+if { [info exists CPUTAPID] == 0 } {
+   set CPUTAPID 0x2ba01477
+}
+
+if { [info exists WORKAREASIZE] == 0 } {
+   set WORKAREASIZE 0x10000
+}
 
 source [find target/stm32_stlink.cfg]
 

diff --git a/tcl/target/stm32f4x_stlink.cfg b/tcl/target/stm32f4x_stlink.cfg
index ec5fb9e48c7bebcaffb343dbf3d24510b61e2760..2308c51c40aac12253fe510a71ba365c33eb8138 100644 (file)
--- a/tcl/target/stm32f4x_stlink.cfg
+++ b/tcl/target/stm32f4x_stlink.cfg
@@ -2,9 +2,17 @@
 # STM32f4x stlink pseudo target
 #
 
-set CHIPNAME stm32f4x
-set CPUTAPID 0x2ba01477
-set WORKAREASIZE 0x10000
+if { [info exists CHIPNAME] == 0 } {
+   set CHIPNAME stm32f4x
+}
+
+if { [info exists CPUTAPID] == 0 } {
+   set CPUTAPID 0x2ba01477
+}
+
+if { [info exists WORKAREASIZE] == 0 } {
+   set WORKAREASIZE 0x10000
+}
 
 source [find target/stm32_stlink.cfg]
 

diff --git a/tcl/target/stm32lx_stlink.cfg b/tcl/target/stm32lx_stlink.cfg
index e28818f36b6f71e3d08b661a3f177a8510328e14..f9211d23d2338088d5a557585b59e2b222fa2d30 100644 (file)
--- a/tcl/target/stm32lx_stlink.cfg
+++ b/tcl/target/stm32lx_stlink.cfg
@@ -2,9 +2,17 @@
 # STM32lx stlink pseudo target
 #
 
-set CHIPNAME stm32lx
-set CPUTAPID 0x2ba01477
-set WORKAREASIZE 0x3800
+if { [info exists CHIPNAME] == 0 } {
+   set CHIPNAME stm32lx
+}
+
+if { [info exists CPUTAPID] == 0 } {
+   set CPUTAPID 0x2ba01477
+}
+
+if { [info exists WORKAREASIZE] == 0 } {
+   set WORKAREASIZE 0x3800
+}
 
 source [find target/stm32_stlink.cfg]