From 29784928289fb9a14939e0dbb890a9b3b87d8fad Mon Sep 17 00:00:00 2001
From: "Earle F. Philhower, III" <earlephilhower@yahoo.com>
Date: Tue, 1 Dec 2020 14:27:26 -0800
Subject: [PATCH 1/2] Update to pyserial 3.5, esptool 3.0

Recent releases may work better with some newer MacOS releases
according to their commit logs.
---
 tools/esptool  | 2 +-
 tools/pyserial | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/esptool b/tools/esptool
index de30f21a22..4fa0bd7b0d 160000
--- a/tools/esptool
+++ b/tools/esptool
@@ -1 +1 @@
-Subproject commit de30f21a222ec62f5a023dd955439b4f57702768
+Subproject commit 4fa0bd7b0d1f69f5ff22b043adc07c5e562a8931
diff --git a/tools/pyserial b/tools/pyserial
index c54c81d933..0e76347475 160000
--- a/tools/pyserial
+++ b/tools/pyserial
@@ -1 +1 @@
-Subproject commit c54c81d933b847458d465cd77e96cd702ff2e7be
+Subproject commit 0e7634747568547b8a7f9fd0c48ed74f16af4b23

From 6f8dd8ce3703b0b9372a7eb88bf6cd1c567207f0 Mon Sep 17 00:00:00 2001
From: "Earle F. Philhower, III" <earlephilhower@yahoo.com>
Date: Tue, 1 Dec 2020 15:58:51 -0800
Subject: [PATCH 2/2] Add backward compatible flash size detection

Ensure esptool detects the flash size and doesn't use the one hardcoded
in the bootloader.  Thanks to @d-a-v for noticing the esptool change.
---
 tools/upload.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/upload.py b/tools/upload.py
index 48352de3a7..2b7016cc95 100755
--- a/tools/upload.py
+++ b/tools/upload.py
@@ -51,6 +51,7 @@
 cmdline = cmdline + ['write_flash']
 if len(write_option):
     cmdline = cmdline + [write_option]
+cmdline = cmdline + ['--flash_size', 'detect']
 cmdline = cmdline + [write_addr, binary]
 
 erase_file = ''