From 8565ac8fbc4683a08640dae219992da1947e40a3 Mon Sep 17 00:00:00 2001
From: "Earle F. Philhower, III" <earlephilhower@yahoo.com>
Date: Tue, 1 Dec 2020 17:41:23 -0800
Subject: [PATCH] Update to pyserial 3.5, esptool 3.0 (#7737)

Recent releases may work better with some newer MacOS releases
according to their commit logs.

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/esptool   | 2 +-
 tools/pyserial  | 2 +-
 tools/upload.py | 1 +
 3 files changed, 3 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
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 = ''