Update esptool.py

Author: Jason2866

tools/esptool.py

@@ -374,6 +374,10 @@ def detect_chip(port=DEFAULT_PORT, baud=ESP_ROM_BAUD, connect_mode='default_rese
                 if chip_id == cls.IMAGE_CHIP_ID:
                     inst = cls(detect_port._port, baud, trace_enabled=trace_enabled)
                     inst._post_connect()
+                    try:
+                        inst.read_reg(ESPLoader.CHIP_DETECT_MAGIC_REG_ADDR)  # Dummy read to check Secure Download mode
+                    except UnsupportedCommandError:
+                        inst.secure_download_mode = True
         except (UnsupportedCommandError, struct.error, FatalError) as e:
             # UnsupportedCmdErr: ESP8266/ESP32 ROM | struct.err: ESP32-S2 | FatalErr: ESP8266/ESP32 STUB
             print(" Unsupported detection protocol, switching and trying again...")
@@ -2376,6 +2380,11 @@ class ESP32C2ROM(ESP32C3ROM):
     CHIP_NAME = "ESP32-C2"
     IMAGE_CHIP_ID = 12
 
+    IROM_MAP_START = 0x42000000
+    IROM_MAP_END   = 0x42400000
+    DROM_MAP_START = 0x3c000000
+    DROM_MAP_END   = 0x3c400000
+
     CHIP_DETECT_MAGIC_VALUE = [0x6f51306f]
 
     EFUSE_BASE = 0x60008800
@@ -4730,16 +4739,21 @@ def flash_xmc_startup():
             print("XMC flash chip boot-up fix successful!")
 
         # Check flash chip connection
-        try:
-            flash_id = esp.flash_id()
-            if flash_id in (0xffffff, 0x000000):
-                print('WARNING: Failed to communicate with the flash chip, read/write operations will fail. '
-                      'Try checking the chip connections or removing any other hardware connected to IOs.')
-        except Exception as e:
-            esp.trace('Unable to verify flash chip connection ({}).'.format(e))
+        if not esp.secure_download_mode:
+            try:
+                flash_id = esp.flash_id()
+                if flash_id in (0xffffff, 0x000000):
+                    print('WARNING: Failed to communicate with the flash chip, read/write operations will fail. '
+                          'Try checking the chip connections or removing any other hardware connected to IOs.')
+            except Exception as e:
+                esp.trace('Unable to verify flash chip connection ({}).'.format(e))
 
         # Check if XMC SPI flash chip booted-up successfully, fix if not
-        flash_xmc_startup()
+        if not esp.secure_download_mode:
+            try:
+                flash_xmc_startup()
+            except Exception as e:
+                esp.trace('Unable to perform XMC flash chip startup sequence ({}).'.format(e))
 
         if hasattr(args, "flash_size"):
             print("Configuring flash size...")