From 8002ed268d5936fbf024b09b60eecae00d058bc4 Mon Sep 17 00:00:00 2001
From: Spencer Oliver <spen@spen-soft.co.uk>
Date: Fri, 27 Apr 2012 10:41:45 +0100
Subject: [PATCH 1/1] 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>
---
 tcl/target/stm32f0x_stlink.cfg | 14 +++++++++++---
 tcl/target/stm32f1x_stlink.cfg | 14 +++++++++++---
 tcl/target/stm32f2x_stlink.cfg | 14 +++++++++++---
 tcl/target/stm32f4x_stlink.cfg | 14 +++++++++++---
 tcl/target/stm32lx_stlink.cfg  | 14 +++++++++++---
 5 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/tcl/target/stm32f0x_stlink.cfg b/tcl/target/stm32f0x_stlink.cfg
index 56da7ca6cb..0c5c010982 100644
--- 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 67dfb7bca3..9faaf6a0b3 100644
--- 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 9c4e6fecde..d46ae7c4a2 100644
--- 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 ec5fb9e48c..2308c51c40 100644
--- 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 e28818f36b..f9211d23d2 100644
--- 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]
 
-- 
2.30.2