diff --git a/tcl/board/stm32100b_eval.cfg b/tcl/board/stm32100b_eval.cfg
index f73443024..e04b612bc 100644
--- a/tcl/board/stm32100b_eval.cfg
+++ b/tcl/board/stm32100b_eval.cfg
@@ -1,7 +1,7 @@
 # This is an STM32 eval board with a single STM32F100VBT6 chip.
 # http://www.st.com/internet/evalboard/product/247099.jsp
 
-# we only have 8k sram
-set WORKAREASIZE 8192
+# The chip has only 8KB sram
+set WORKAREASIZE 0x2000
 
 source [find target/stm32.cfg]
diff --git a/tcl/board/stm3210b_eval.cfg b/tcl/board/stm3210b_eval.cfg
index d6b9dad56..70798c186 100644
--- a/tcl/board/stm3210b_eval.cfg
+++ b/tcl/board/stm3210b_eval.cfg
@@ -1,8 +1,7 @@
 # This is an STM32 eval board with a single STM32F10x (128KB) chip.
 # http://www.st.com/internet/evalboard/product/176090.jsp
 
-# increase working area for faster flash programming
-
-set WORKAREASIZE 32768
+# increase working area to 32KB for faster flash programming
+set WORKAREASIZE 0x8000
 
 source [find target/stm32.cfg]
diff --git a/tcl/board/stm3210c_eval.cfg b/tcl/board/stm3210c_eval.cfg
index 6ab9181bb..27684f0d8 100644
--- a/tcl/board/stm3210c_eval.cfg
+++ b/tcl/board/stm3210c_eval.cfg
@@ -1,8 +1,7 @@
 # This is an STM32 eval board with a single STM32F107VCT chip.
 # http://www.st.com/internet/evalboard/product/217965.jsp
 
-# increase working area for faster flash programming
-
-set WORKAREASIZE 32768
+# increase working area to 32KB for faster flash programming
+set WORKAREASIZE 0x8000
 
 source [find target/stm32.cfg]
diff --git a/tcl/board/stm3210e_eval.cfg b/tcl/board/stm3210e_eval.cfg
index b1da54c4d..786d02799 100644
--- a/tcl/board/stm3210e_eval.cfg
+++ b/tcl/board/stm3210e_eval.cfg
@@ -1,9 +1,8 @@
 # This is an STM32 eval board with a single STM32F103ZET6 chip.
 # http://www.st.com/internet/evalboard/product/204176.jsp
 
-# increase working area for faster flash programming
-
-set WORKAREASIZE 32768
+# increase working area to 32KB for faster flash programming
+set WORKAREASIZE 0x8000
 
 source [find target/stm32.cfg]
 
diff --git a/tcl/board/stm32f10x_128k_eval.cfg b/tcl/board/stm32f10x_128k_eval.cfg
deleted file mode 100644
index ce0737083..000000000
--- a/tcl/board/stm32f10x_128k_eval.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# This is an STM32 eval board with a single STM32F103VBT6 chip on it.
-
-source [find target/stm32.cfg]
-