add esp32 c61 support (#158)

fix lint

fix lint

src/esploader.ts

@@ -139,6 +139,11 @@ async function magic2Chip(magic: number): Promise<ROM | null> {
       const { ESP32C6ROM } = await import("./targets/esp32c6.js");
       return new ESP32C6ROM();
     }
+    case 0x33f0206f:
+    case 0x2421606f: {
+      const { ESP32C61ROM } = await import("./targets/esp32c61.js");
+      return new ESP32C61ROM();
+    }
     case 0x1101406f:
     case 0x63e1406f: {
       const { ESP32C5ROM } = await import("./targets/esp32c5.js");

src/targets/esp32c61.ts

@@ -0,0 +1,148 @@
+import { ESPLoader } from "../esploader";
+import { ESP32C6ROM } from "./esp32c6";
+import ESP32C61_STUB from "./stub_flasher/stub_flasher_32c61.json";
+
+export class ESP32C61ROM extends ESP32C6ROM {
+  public CHIP_NAME = "ESP32-C61";
+  public IMAGE_CHIP_ID = 20;
+
+  public CHIP_DETECT_MAGIC_VALUE = [0x33f0206f, 0x2421606f];
+
+  public TEXT_START = ESP32C61_STUB.text_start;
+  public ENTRY = ESP32C61_STUB.entry;
+  public DATA_START = ESP32C61_STUB.data_start;
+  public ROM_DATA = ESP32C61_STUB.data;
+  public ROM_TEXT = ESP32C61_STUB.text;
+
+  public UART_DATE_REG_ADDR = 0x60000000 + 0x7c;
+
+  public EFUSE_BASE = 0x600b4800;
+  public EFUSE_BLOCK1_ADDR = this.EFUSE_BASE + 0x044;
+  public MAC_EFUSE_REG = this.EFUSE_BASE + 0x044;
+
+  public EFUSE_RD_REG_BASE = this.EFUSE_BASE + 0x030; // BLOCK0 read base address
+
+  public EFUSE_PURPOSE_KEY0_REG = this.EFUSE_BASE + 0x34;
+  public EFUSE_PURPOSE_KEY0_SHIFT = 0;
+  public EFUSE_PURPOSE_KEY1_REG = this.EFUSE_BASE + 0x34;
+  public EFUSE_PURPOSE_KEY1_SHIFT = 4;
+  public EFUSE_PURPOSE_KEY2_REG = this.EFUSE_BASE + 0x34;
+  public EFUSE_PURPOSE_KEY2_SHIFT = 8;
+  public EFUSE_PURPOSE_KEY3_REG = this.EFUSE_BASE + 0x34;
+  public EFUSE_PURPOSE_KEY3_SHIFT = 12;
+  public EFUSE_PURPOSE_KEY4_REG = this.EFUSE_BASE + 0x34;
+  public EFUSE_PURPOSE_KEY4_SHIFT = 16;
+  public EFUSE_PURPOSE_KEY5_REG = this.EFUSE_BASE + 0x34;
+  public EFUSE_PURPOSE_KEY5_SHIFT = 20;
+
+  public EFUSE_DIS_DOWNLOAD_MANUAL_ENCRYPT_REG = this.EFUSE_RD_REG_BASE;
+  public EFUSE_DIS_DOWNLOAD_MANUAL_ENCRYPT = 1 << 20;
+
+  public EFUSE_SPI_BOOT_CRYPT_CNT_REG = this.EFUSE_BASE + 0x030;
+  public EFUSE_SPI_BOOT_CRYPT_CNT_MASK = 0x7 << 23;
+
+  public EFUSE_SECURE_BOOT_EN_REG = this.EFUSE_BASE + 0x034;
+  public EFUSE_SECURE_BOOT_EN_MASK = 1 << 26;
+
+  public FLASH_FREQUENCY = {
+    "80m": 0xf,
+    "40m": 0x0,
+    "20m": 0x2,
+  };
+
+  public MEMORY_MAP = [
+    [0x00000000, 0x00010000, "PADDING"],
+    [0x41800000, 0x42000000, "DROM"],
+    [0x40800000, 0x40860000, "DRAM"],
+    [0x40800000, 0x40860000, "BYTE_ACCESSIBLE"],
+    [0x4004ac00, 0x40050000, "DROM_MASK"],
+    [0x40000000, 0x4004ac00, "IROM_MASK"],
+    [0x41000000, 0x41800000, "IROM"],
+    [0x40800000, 0x40860000, "IRAM"],
+    [0x50000000, 0x50004000, "RTC_IRAM"],
+    [0x50000000, 0x50004000, "RTC_DRAM"],
+    [0x600fe000, 0x60100000, "MEM_INTERNAL2"],
+  ];
+
+  public UF2_FAMILY_ID = 0x77d850c4;
+
+  public EFUSE_MAX_KEY = 5;
+  public KEY_PURPOSES = {
+    0: "USER/EMPTY",
+    1: "ECDSA_KEY",
+    2: "XTS_AES_256_KEY_1",
+    3: "XTS_AES_256_KEY_2",
+    4: "XTS_AES_128_KEY",
+    5: "HMAC_DOWN_ALL",
+    6: "HMAC_DOWN_JTAG",
+    7: "HMAC_DOWN_DIGITAL_SIGNATURE",
+    8: "HMAC_UP",
+    9: "SECURE_BOOT_DIGEST0",
+    10: "SECURE_BOOT_DIGEST1",
+    11: "SECURE_BOOT_DIGEST2",
+    12: "KM_INIT_KEY",
+    13: "XTS_AES_256_KEY_1_PSRAM",
+    14: "XTS_AES_256_KEY_2_PSRAM",
+    15: "XTS_AES_128_KEY_PSRAM",
+  };
+
+  public async getPkgVersion(loader: ESPLoader): Promise<number> {
+    const numWord = 2;
+    return ((await loader.readReg(this.EFUSE_BLOCK1_ADDR + 4 * numWord)) >> 26) & 0x07;
+  }
+
+  public async getMinorChipVersion(loader: ESPLoader): Promise<number> {
+    const numWord = 2;
+    return ((await loader.readReg(this.EFUSE_BLOCK1_ADDR + 4 * numWord)) >> 0) & 0x0f;
+  }
+
+  public async getMajorChipVersion(loader: ESPLoader): Promise<number> {
+    const numWord = 2;
+    return ((await loader.readReg(this.EFUSE_BLOCK1_ADDR + 4 * numWord)) >> 4) & 0x03;
+  }
+
+  public async getChipDescription(loader: ESPLoader): Promise<string> {
+    const pkgVer = await this.getPkgVersion(loader);
+    let desc: string;
+    if (pkgVer === 0) {
+      desc = "ESP32-C61";
+    } else {
+      desc = "unknown ESP32-C61";
+    }
+    const majorRev = await this.getMajorChipVersion(loader);
+    const minorRev = await this.getMinorChipVersion(loader);
+    return `${desc} (revision v${majorRev}.${minorRev})`;
+  }
+
+  public async getChipFeatures(loader: ESPLoader): Promise<string[]> {
+    return ["WiFi 6", "BT 5"];
+  }
+
+  public async readMac(loader: ESPLoader) {
+    let mac0 = await loader.readReg(this.MAC_EFUSE_REG);
+    mac0 = mac0 >>> 0;
+    let mac1 = await loader.readReg(this.MAC_EFUSE_REG + 4);
+    mac1 = (mac1 >>> 0) & 0x0000ffff;
+    const mac = new Uint8Array(6);
+    mac[0] = (mac1 >> 8) & 0xff;
+    mac[1] = mac1 & 0xff;
+    mac[2] = (mac0 >> 24) & 0xff;
+    mac[3] = (mac0 >> 16) & 0xff;
+    mac[4] = (mac0 >> 8) & 0xff;
+    mac[5] = mac0 & 0xff;
+
+    return (
+      this._d2h(mac[0]) +
+      ":" +
+      this._d2h(mac[1]) +
+      ":" +
+      this._d2h(mac[2]) +
+      ":" +
+      this._d2h(mac[3]) +
+      ":" +
+      this._d2h(mac[4]) +
+      ":" +
+      this._d2h(mac[5])
+    );
+  }
+}

src/targets/stub_flasher/stub_flasher_32c61.json

@@ -0,0 +1,8 @@
+{
+  "entry": 1082132164,
+  "text": "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",
+  "text_start": 1082130432,
+  "data": "FECAQHQKgEDECoBAHAuAQOoLgEBWDIBABAyAQEAJgECmC4BA5guAQDALgEDwCIBAZAuAQPAIgEBOCoBAlAqAQMQKgEAcC4BAYAqAQKQJgEDUCYBAXAqAQK4OgEDECoBAbg2AQGYOgEAwCIBAjg6AQDAIgEAwCIBAMAiAQDAIgEAwCIBAMAiAQDAIgEAwCIBACg2AQDAIgECMDYBAZg6AQA==",
+  "data_start": 1082223536,
+  "bss_start": 1082146816
+}