From e6ad82a0b27745d0e180fcfa72c92e2f18ccaa17 Mon Sep 17 00:00:00 2001
From: tatsutaigu <44219065+tatsutaigu@users.noreply.github.com>
Date: Fri, 27 Sep 2019 11:19:08 +0900
Subject: [PATCH] idf.py: Add --before flag to esptool.py call

Merges https://github.com/espressif/esp-idf/pull/4125
---
 tools/idf.py                       | 3 ++-
 tools/idf_py_actions/serial_ext.py | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/idf.py b/tools/idf.py
index bc4a556108..3cba357a56 100755
--- a/tools/idf.py
+++ b/tools/idf.py
@@ -448,10 +448,11 @@ def init_cli(verbose_output=None):
                     for o, f in flash_items:
                         cmd += o + " " + flasher_path(f) + " "
 
-                print("%s -p %s -b %s --after %s write_flash %s" % (
+                print("%s -p %s -b %s --before %s --after %s write_flash %s" % (
                     _safe_relpath("%s/components/esptool_py/esptool/esptool.py" % os.environ["IDF_PATH"]),
                     args.port or "(PORT)",
                     args.baud,
+                    flasher_args["extra_esptool_args"]["before"],
                     flasher_args["extra_esptool_args"]["after"],
                     cmd.strip(),
                 ))
diff --git a/tools/idf_py_actions/serial_ext.py b/tools/idf_py_actions/serial_ext.py
index 76d80a1afb..f30a667a1c 100644
--- a/tools/idf_py_actions/serial_ext.py
+++ b/tools/idf_py_actions/serial_ext.py
@@ -40,6 +40,7 @@ def action_extensions(base_actions, project_path):
             flasher_args = json.load(f)
 
         extra_esptool_args = flasher_args["extra_esptool_args"]
+        result += ["--before", extra_esptool_args["before"]]
         result += ["--after", extra_esptool_args["after"]]
         return result