From 59f409a787d3361a4a3713af9a854d8aa66841e6 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Thu, 13 Dec 2018 13:43:10 +1100
Subject: [PATCH] stm32/boards: Allow OpenOCD stm_flash procedure to accept
 single FW img.

To support deplop-openocd on target boards that use TEXT0_ADDR only and
have their firmware in a single binary image.
---
 ports/stm32/boards/openocd_stm32f4.cfg | 12 +++++++-----
 ports/stm32/boards/openocd_stm32f7.cfg | 12 +++++++-----
 ports/stm32/boards/openocd_stm32l4.cfg | 12 +++++++-----
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/ports/stm32/boards/openocd_stm32f4.cfg b/ports/stm32/boards/openocd_stm32f4.cfg
index ee96b91bd9..19631a7c8e 100644
--- a/ports/stm32/boards/openocd_stm32f4.cfg
+++ b/ports/stm32/boards/openocd_stm32f4.cfg
@@ -17,7 +17,7 @@ source [find target/stm32f4x.cfg]
 reset_config srst_only
 init
 
-proc stm_flash { BIN0 ADDR0 BIN1 ADDR1 } {
+proc stm_flash { BIN0 ADDR0 {BIN1 ""} {ADDR1 ""} } {
     reset halt
     sleep 100
     wait_halt 2
@@ -25,10 +25,12 @@ proc stm_flash { BIN0 ADDR0 BIN1 ADDR1 } {
     sleep 100
     verify_image $BIN0 $ADDR0
     sleep 100
-    flash write_image erase $BIN1 $ADDR1
-    sleep 100
-    verify_image $BIN1 $ADDR1
-    sleep 100
+    if {$BIN1 ne ""} {
+        flash write_image erase $BIN1 $ADDR1
+        sleep 100
+        verify_image $BIN1 $ADDR1
+        sleep 100
+    }
     reset run
     shutdown
 }
diff --git a/ports/stm32/boards/openocd_stm32f7.cfg b/ports/stm32/boards/openocd_stm32f7.cfg
index 55b6326503..543ba90857 100644
--- a/ports/stm32/boards/openocd_stm32f7.cfg
+++ b/ports/stm32/boards/openocd_stm32f7.cfg
@@ -17,7 +17,7 @@ source [find target/stm32f7x.cfg]
 reset_config srst_only
 init
 
-proc stm_flash { BIN0 ADDR0 BIN1 ADDR1 } {
+proc stm_flash { BIN0 ADDR0 {BIN1 ""} {ADDR1 ""} } {
     reset halt
     sleep 100
     wait_halt 2
@@ -25,10 +25,12 @@ proc stm_flash { BIN0 ADDR0 BIN1 ADDR1 } {
     sleep 100
     verify_image $BIN0 $ADDR0
     sleep 100
-    flash write_image erase $BIN1 $ADDR1
-    sleep 100
-    verify_image $BIN1 $ADDR1
-    sleep 100
+    if {$BIN1 ne ""} {
+        flash write_image erase $BIN1 $ADDR1
+        sleep 100
+        verify_image $BIN1 $ADDR1
+        sleep 100
+    }
     reset run
     shutdown
 }
diff --git a/ports/stm32/boards/openocd_stm32l4.cfg b/ports/stm32/boards/openocd_stm32l4.cfg
index 59e98de038..3be30ba000 100644
--- a/ports/stm32/boards/openocd_stm32l4.cfg
+++ b/ports/stm32/boards/openocd_stm32l4.cfg
@@ -17,7 +17,7 @@ source [find target/stm32l4x.cfg]
 reset_config srst_only
 init
 
-proc stm_flash { BIN0 ADDR0 BIN1 ADDR1 } {
+proc stm_flash { BIN0 ADDR0 {BIN1 ""} {ADDR1 ""} } {
     reset halt
     sleep 100
     wait_halt 2
@@ -25,10 +25,12 @@ proc stm_flash { BIN0 ADDR0 BIN1 ADDR1 } {
     sleep 100
     verify_image $BIN0 $ADDR0
     sleep 100
-    flash write_image erase $BIN1 $ADDR1
-    sleep 100
-    verify_image $BIN1 $ADDR1
-    sleep 100
+    if {$BIN1 ne ""} {
+        flash write_image erase $BIN1 $ADDR1
+        sleep 100
+        verify_image $BIN1 $ADDR1
+        sleep 100
+    }
     reset run
     shutdown
 }