feat(esptool): Update chip description for ESP32-C2/ESP8684H

Author: KonstantinKondrashov

esptool/targets/esp32c2.py

@@ -77,14 +77,24 @@ def get_pkg_version(self):
     def get_chip_description(self):
         chip_name = {
             0: "ESP32-C2",
-            1: "ESP32-C2",
+            1: "ESP8684H",
         }.get(self.get_pkg_version(), "Unknown ESP32-C2")
         major_rev = self.get_major_chip_version()
         minor_rev = self.get_minor_chip_version()
         return f"{chip_name} (revision v{major_rev}.{minor_rev})"
 
     def get_chip_features(self):
-        return ["Wi-Fi", "BT 5 (LE)", "Single Core", "120MHz"]
+        features = ["Wi-Fi", "BT 5 (LE)", "Single Core", "120MHz"]
+
+        flash = {
+            0: None,
+            1: "Embedded Flash 4MB",
+            2: "Embedded Flash 2MB",
+            3: "Embedded Flash 1MB",
+        }.get(self.get_flash_cap(), "Unknown Embedded Flash")
+        if flash is not None:
+            features += [flash + f" ({self.get_flash_vendor()})"]
+        return features
 
     def get_minor_chip_version(self):
         num_word = 1
@@ -95,14 +105,13 @@ def get_major_chip_version(self):
         return (self.read_reg(self.EFUSE_BLOCK2_ADDR + (4 * num_word)) >> 20) & 0x3
 
     def get_flash_cap(self):
-        # ESP32-C2 doesn't have eFuse field FLASH_CAP.
-        # Can't get info about the flash chip.
-        return 0
+        num_word = 7
+        return (self.read_reg(self.EFUSE_BLOCK2_ADDR + (4 * num_word)) >> 29) & 0x7
 
     def get_flash_vendor(self):
-        # ESP32-C2 doesn't have eFuse field FLASH_VENDOR.
-        # Can't get info about the flash chip.
-        return ""
+        num_word = 7
+        vendor_id = (self.read_reg(self.EFUSE_BLOCK2_ADDR + (4 * num_word)) >> 24) & 0x7
+        return {1: "XMC", 2: "GD", 3: "FM", 4: "TT", 5: "ZBIT"}.get(vendor_id, "")
 
     def get_crystal_freq(self):
         # The crystal detection algorithm of ESP32/ESP8266 works for ESP32-C2 as well.

test/test_esptool.py

@@ -1082,22 +1082,6 @@ def test_flash_id_trace(self):
         assert "Manufacturer:" in res
         assert "Device:" in res
 
-    @pytest.mark.quick_test
-    @pytest.mark.skipif(
-        arg_chip not in ["esp32c2"],
-        reason="This test make sense only for EPS32-C2",
-    )
-    def test_flash_size(self):
-        """Test ESP32-C2 efuse block for flash size feature"""
-        # ESP32-C2 class inherits methods from ESP32-C3 class
-        # but it does not have the same amount of efuse blocks
-        # the methods are overwritten
-        # in case anything changes this test will fail to remind us
-        res = self.run_esptool("flash-id")
-        lines = res.splitlines()
-        for line in lines:
-            assert "embedded flash" not in line.lower()
-
     @pytest.mark.quick_test
     def test_flash_sfdp(self):
         """Test manufacturer and device response of flash detection."""
@@ -1492,6 +1476,9 @@ class TestAutoDetect(EsptoolTestCase):
     def _check_output(self, output):
         expected_chip_name = esptool.util.expand_chip_name(arg_chip)
         assert f"Detecting chip type... {expected_chip_name}" in output
+        if arg_chip == "esp32c2":
+            # chip_name depends on the package, for example ESP8684H.
+            expected_chip_name = ""
         assert f"{'Chip type:':<20}{expected_chip_name}" in output
 
     @pytest.mark.quick_test