esp32tool 1.3.4 → 1.3.6

package/dist/const.d.ts

@@ -277,6 +277,16 @@ export declare const ESP32P4_GPIO_STRAP_REG = 1343094840;
 export declare const ESP32P4_GPIO_STRAP_SPI_BOOT_MASK = 8;
 export declare const ESP32P4_RTC_CNTL_OPTION1_REG = 1343291400;
 export declare const ESP32P4_RTC_CNTL_FORCE_DOWNLOAD_BOOT_MASK = 4;
+export declare const ESP32P4_DR_REG_LPAON_BASE = 1343291392;
+export declare const ESP32P4_DR_REG_PMU_BASE: number;
+export declare const ESP32P4_DR_REG_LP_SYS_BASE: number;
+export declare const ESP32P4_LP_SYSTEM_REG_ANA_XPD_PAD_GROUP_REG: number;
+export declare const ESP32P4_PMU_EXT_LDO_P0_0P1A_ANA_REG: number;
+export declare const ESP32P4_PMU_ANA_0P1A_EN_CUR_LIM_0: number;
+export declare const ESP32P4_PMU_EXT_LDO_P0_0P1A_REG: number;
+export declare const ESP32P4_PMU_0P1A_TARGET0_0: number;
+export declare const ESP32P4_PMU_0P1A_FORCE_TIEH_SEL_0: number;
+export declare const ESP32P4_PMU_DATE_REG: number;
 export declare const ESP32S31_SPI_REG_BASE = 542113792;
 export declare const ESP32S31_BASEFUSEADDR = 544296960;
 export declare const ESP32S31_EFUSE_BLOCK1_ADDR: number;

package/dist/const.js

@@ -318,6 +318,17 @@ export const ESP32P4_GPIO_STRAP_REG = 0x500e0038;
 export const ESP32P4_GPIO_STRAP_SPI_BOOT_MASK = 0x8; // Not download mode
 export const ESP32P4_RTC_CNTL_OPTION1_REG = 0x50110008;
 export const ESP32P4_RTC_CNTL_FORCE_DOWNLOAD_BOOT_MASK = 0x4; // Is download mode forced over USB?
+// Flash power-on related registers and bits needed for ECO6 (Rev 301)
+export const ESP32P4_DR_REG_LPAON_BASE = 0x50110000;
+export const ESP32P4_DR_REG_PMU_BASE = ESP32P4_DR_REG_LPAON_BASE + 0x5000;
+export const ESP32P4_DR_REG_LP_SYS_BASE = ESP32P4_DR_REG_LPAON_BASE + 0x0;
+export const ESP32P4_LP_SYSTEM_REG_ANA_XPD_PAD_GROUP_REG = ESP32P4_DR_REG_LP_SYS_BASE + 0x10c;
+export const ESP32P4_PMU_EXT_LDO_P0_0P1A_ANA_REG = ESP32P4_DR_REG_PMU_BASE + 0x1bc;
+export const ESP32P4_PMU_ANA_0P1A_EN_CUR_LIM_0 = 1 << 27;
+export const ESP32P4_PMU_EXT_LDO_P0_0P1A_REG = ESP32P4_DR_REG_PMU_BASE + 0x1b8;
+export const ESP32P4_PMU_0P1A_TARGET0_0 = 0xff << 23;
+export const ESP32P4_PMU_0P1A_FORCE_TIEH_SEL_0 = 1 << 7;
+export const ESP32P4_PMU_DATE_REG = ESP32P4_DR_REG_PMU_BASE + 0x3fc;
 export const ESP32S31_SPI_REG_BASE = 0x20500000;
 export const ESP32S31_BASEFUSEADDR = 0x20715000;
 export const ESP32S31_EFUSE_BLOCK1_ADDR = ESP32S31_BASEFUSEADDR + 0x044;

package/dist/esp_loader.d.ts

@@ -88,6 +88,12 @@ export declare class ESPLoader extends EventTarget {
      * Get chip revision for ESP32-P4
      */
     getChipRevision(): Promise<number>;
+    /**
+     * Power on the flash chip for ESP32-P4 Rev 301 (ECO6)
+     * The flash chip is powered off by default on ECO6, when the default flash
+     * voltage changed from 1.8V to 3.3V. This is to prevent damage to 1.8V flash chips.
+     */
+    powerOnFlash(): Promise<void>;
     /**
      * Get security info including chip ID (ESP32-C3 and later)
      */

package/dist/esp_loader.js

@@ -1,5 +1,5 @@
 /// <reference types="@types/w3c-web-serial" />
-import { CHIP_FAMILY_ESP32, CHIP_FAMILY_ESP32S2, CHIP_FAMILY_ESP32S3, CHIP_FAMILY_ESP32C2, CHIP_FAMILY_ESP32C3, CHIP_FAMILY_ESP32C5, CHIP_FAMILY_ESP32C6, CHIP_FAMILY_ESP32C61, CHIP_FAMILY_ESP32H2, CHIP_FAMILY_ESP32H4, CHIP_FAMILY_ESP32H21, CHIP_FAMILY_ESP32P4, CHIP_FAMILY_ESP32S31, CHIP_FAMILY_ESP8266, MAX_TIMEOUT, DEFAULT_TIMEOUT, ERASE_REGION_TIMEOUT_PER_MB, ESP_CHANGE_BAUDRATE, ESP_CHECKSUM_MAGIC, ESP_FLASH_BEGIN, ESP_FLASH_DATA, ESP_FLASH_END, ESP_MEM_BEGIN, ESP_MEM_DATA, ESP_MEM_END, ESP_READ_REG, ESP_WRITE_REG, ESP_SPI_ATTACH, ESP_SYNC, ESP_GET_SECURITY_INFO, FLASH_SECTOR_SIZE, FLASH_WRITE_SIZE, STUB_FLASH_WRITE_SIZE, MEM_END_ROM_TIMEOUT, ROM_INVALID_RECV_MSG, SYNC_PACKET, SYNC_TIMEOUT, USB_RAM_BLOCK, ESP_ERASE_FLASH, ESP_ERASE_REGION, ESP_READ_FLASH, CHIP_ERASE_TIMEOUT, FLASH_READ_TIMEOUT, timeoutPerMb, ESP_ROM_BAUD, USB_JTAG_SERIAL_PID, ESP_FLASH_DEFL_BEGIN, ESP_FLASH_DEFL_DATA, ESP_FLASH_DEFL_END, getSpiFlashAddresses, DETECTED_FLASH_SIZES, CHIP_DETECT_MAGIC_REG_ADDR, CHIP_DETECT_MAGIC_VALUES, CHIP_ID_TO_INFO, ESP32P4_EFUSE_BLOCK1_ADDR, SlipReadError, ESP32S2_RTC_CNTL_WDTWPROTECT_REG, ESP32S2_RTC_CNTL_WDTCONFIG0_REG, ESP32S2_RTC_CNTL_WDTCONFIG1_REG, ESP32S2_RTC_CNTL_WDT_WKEY, ESP32S2_RTC_CNTL_OPTION1_REG, ESP32S2_RTC_CNTL_FORCE_DOWNLOAD_BOOT_MASK, ESP32S3_RTC_CNTL_WDTWPROTECT_REG, ESP32S3_RTC_CNTL_WDTCONFIG0_REG, ESP32S3_RTC_CNTL_WDTCONFIG1_REG, ESP32S3_RTC_CNTL_WDT_WKEY, ESP32S3_RTC_CNTL_OPTION1_REG, ESP32S3_RTC_CNTL_FORCE_DOWNLOAD_BOOT_MASK, ESP32C3_EFUSE_RD_MAC_SPI_SYS_3_REG, ESP32C3_EFUSE_RD_MAC_SPI_SYS_5_REG, ESP32C3_RTC_CNTL_WDTWPROTECT_REG, ESP32C3_RTC_CNTL_WDTCONFIG0_REG, ESP32C3_RTC_CNTL_WDTCONFIG1_REG, ESP32C3_RTC_CNTL_WDT_WKEY, ESP32C5_C6_RTC_CNTL_WDTWPROTECT_REG, ESP32C5_C6_RTC_CNTL_WDTCONFIG0_REG, ESP32C5_C6_RTC_CNTL_WDTCONFIG1_REG, ESP32C5_C6_RTC_CNTL_WDT_WKEY, ESP32P4_RTC_CNTL_WDTWPROTECT_REG, ESP32P4_RTC_CNTL_WDTCONFIG0_REG, ESP32P4_RTC_CNTL_WDTCONFIG1_REG, ESP32P4_RTC_CNTL_WDT_WKEY, ESP32P4_RTC_CNTL_OPTION1_REG, ESP32P4_RTC_CNTL_FORCE_DOWNLOAD_BOOT_MASK, } from "./const";
+import { CHIP_FAMILY_ESP32, CHIP_FAMILY_ESP32S2, CHIP_FAMILY_ESP32S3, CHIP_FAMILY_ESP32C2, CHIP_FAMILY_ESP32C3, CHIP_FAMILY_ESP32C5, CHIP_FAMILY_ESP32C6, CHIP_FAMILY_ESP32C61, CHIP_FAMILY_ESP32H2, CHIP_FAMILY_ESP32H4, CHIP_FAMILY_ESP32H21, CHIP_FAMILY_ESP32P4, CHIP_FAMILY_ESP32S31, CHIP_FAMILY_ESP8266, MAX_TIMEOUT, DEFAULT_TIMEOUT, ERASE_REGION_TIMEOUT_PER_MB, ESP_CHANGE_BAUDRATE, ESP_CHECKSUM_MAGIC, ESP_FLASH_BEGIN, ESP_FLASH_DATA, ESP_FLASH_END, ESP_MEM_BEGIN, ESP_MEM_DATA, ESP_MEM_END, ESP_READ_REG, ESP_WRITE_REG, ESP_SPI_ATTACH, ESP_SYNC, ESP_GET_SECURITY_INFO, FLASH_SECTOR_SIZE, FLASH_WRITE_SIZE, STUB_FLASH_WRITE_SIZE, MEM_END_ROM_TIMEOUT, ROM_INVALID_RECV_MSG, SYNC_PACKET, SYNC_TIMEOUT, USB_RAM_BLOCK, ESP_ERASE_FLASH, ESP_ERASE_REGION, ESP_READ_FLASH, CHIP_ERASE_TIMEOUT, FLASH_READ_TIMEOUT, timeoutPerMb, ESP_ROM_BAUD, USB_JTAG_SERIAL_PID, ESP_FLASH_DEFL_BEGIN, ESP_FLASH_DEFL_DATA, ESP_FLASH_DEFL_END, getSpiFlashAddresses, DETECTED_FLASH_SIZES, CHIP_DETECT_MAGIC_REG_ADDR, CHIP_DETECT_MAGIC_VALUES, CHIP_ID_TO_INFO, ESP32P4_EFUSE_BLOCK1_ADDR, SlipReadError, ESP32S2_RTC_CNTL_WDTWPROTECT_REG, ESP32S2_RTC_CNTL_WDTCONFIG0_REG, ESP32S2_RTC_CNTL_WDTCONFIG1_REG, ESP32S2_RTC_CNTL_WDT_WKEY, ESP32S2_RTC_CNTL_OPTION1_REG, ESP32S2_RTC_CNTL_FORCE_DOWNLOAD_BOOT_MASK, ESP32S3_RTC_CNTL_WDTWPROTECT_REG, ESP32S3_RTC_CNTL_WDTCONFIG0_REG, ESP32S3_RTC_CNTL_WDTCONFIG1_REG, ESP32S3_RTC_CNTL_WDT_WKEY, ESP32S3_RTC_CNTL_OPTION1_REG, ESP32S3_RTC_CNTL_FORCE_DOWNLOAD_BOOT_MASK, ESP32C3_EFUSE_RD_MAC_SPI_SYS_3_REG, ESP32C3_EFUSE_RD_MAC_SPI_SYS_5_REG, ESP32C3_RTC_CNTL_WDTWPROTECT_REG, ESP32C3_RTC_CNTL_WDTCONFIG0_REG, ESP32C3_RTC_CNTL_WDTCONFIG1_REG, ESP32C3_RTC_CNTL_WDT_WKEY, ESP32C5_C6_RTC_CNTL_WDTWPROTECT_REG, ESP32C5_C6_RTC_CNTL_WDTCONFIG0_REG, ESP32C5_C6_RTC_CNTL_WDTCONFIG1_REG, ESP32C5_C6_RTC_CNTL_WDT_WKEY, ESP32P4_RTC_CNTL_WDTWPROTECT_REG, ESP32P4_RTC_CNTL_WDTCONFIG0_REG, ESP32P4_RTC_CNTL_WDTCONFIG1_REG, ESP32P4_RTC_CNTL_WDT_WKEY, ESP32P4_RTC_CNTL_OPTION1_REG, ESP32P4_RTC_CNTL_FORCE_DOWNLOAD_BOOT_MASK, ESP32P4_LP_SYSTEM_REG_ANA_XPD_PAD_GROUP_REG, ESP32P4_PMU_EXT_LDO_P0_0P1A_ANA_REG, ESP32P4_PMU_ANA_0P1A_EN_CUR_LIM_0, ESP32P4_PMU_EXT_LDO_P0_0P1A_REG, ESP32P4_PMU_0P1A_TARGET0_0, ESP32P4_PMU_0P1A_FORCE_TIEH_SEL_0, ESP32P4_PMU_DATE_REG, } from "./const";
 import { getStubCode } from "./stubs";
 import { hexFormatter, sleep, slipEncode, toHex } from "./util";
 import { deflate } from "pako";
@@ -345,6 +345,10 @@ export class ESPLoader extends EventTarget {
         await this.connectWithResetStrategies();
         // Detect chip type
         await this.detectChip();
+        // Power on flash for ESP32-P4 Rev 301 (must be done before loading stub)
+        if (this.chipFamily === CHIP_FAMILY_ESP32P4 && this.chipRevision === 301) {
+            await this.powerOnFlash();
+        }
         // Detect if device is using USB-JTAG/Serial or USB-OTG (not external serial chip)
         // This is needed to determine the correct reset strategy for console mode
         try {
@@ -460,6 +464,42 @@ export class ESPLoader extends EventTarget {
         }
         return 0;
     }
+    /**
+     * Power on the flash chip for ESP32-P4 Rev 301 (ECO6)
+     * The flash chip is powered off by default on ECO6, when the default flash
+     * voltage changed from 1.8V to 3.3V. This is to prevent damage to 1.8V flash chips.
+     */
+    async powerOnFlash() {
+        if (this.chipFamily !== CHIP_FAMILY_ESP32P4) {
+            return; // Only needed for ESP32-P4
+        }
+        if (this.chipRevision !== 301) {
+            return; // Only needed for Rev 301 (ECO6)
+        }
+        this.logger.debug("Powering on flash for ESP32-P4 Rev 301 (ECO6)");
+        // Power up pad group
+        await this.writeRegister(ESP32P4_LP_SYSTEM_REG_ANA_XPD_PAD_GROUP_REG, 1);
+        await sleep(10); // 0.01 seconds
+        // Flash power up sequence
+        const pmuAnaReg = await this.readRegister(ESP32P4_PMU_EXT_LDO_P0_0P1A_ANA_REG);
+        await this.writeRegister(ESP32P4_PMU_EXT_LDO_P0_0P1A_ANA_REG, pmuAnaReg | ESP32P4_PMU_ANA_0P1A_EN_CUR_LIM_0);
+        const pmuReg = await this.readRegister(ESP32P4_PMU_EXT_LDO_P0_0P1A_REG);
+        await this.writeRegister(ESP32P4_PMU_EXT_LDO_P0_0P1A_REG, pmuReg | ESP32P4_PMU_0P1A_FORCE_TIEH_SEL_0);
+        const pmuDateReg = await this.readRegister(ESP32P4_PMU_DATE_REG);
+        await this.writeRegister(ESP32P4_PMU_DATE_REG, pmuDateReg | (3 << 0));
+        await sleep(0.05); // 0.00005 seconds = 0.05 ms
+        const pmuAnaReg2 = await this.readRegister(ESP32P4_PMU_EXT_LDO_P0_0P1A_ANA_REG);
+        await this.writeRegister(ESP32P4_PMU_EXT_LDO_P0_0P1A_ANA_REG, pmuAnaReg2 & ~ESP32P4_PMU_ANA_0P1A_EN_CUR_LIM_0);
+        const pmuReg2 = await this.readRegister(ESP32P4_PMU_EXT_LDO_P0_0P1A_REG);
+        await this.writeRegister(ESP32P4_PMU_EXT_LDO_P0_0P1A_REG, pmuReg2 & ~ESP32P4_PMU_0P1A_TARGET0_0);
+        // Update eFuse voltage to PMU
+        const pmuReg3 = await this.readRegister(ESP32P4_PMU_EXT_LDO_P0_0P1A_REG);
+        await this.writeRegister(ESP32P4_PMU_EXT_LDO_P0_0P1A_REG, pmuReg3 | 0x80);
+        const pmuReg4 = await this.readRegister(ESP32P4_PMU_EXT_LDO_P0_0P1A_REG);
+        await this.writeRegister(ESP32P4_PMU_EXT_LDO_P0_0P1A_REG, pmuReg4 & ~ESP32P4_PMU_0P1A_FORCE_TIEH_SEL_0);
+        await sleep(2); // 0.0018 seconds = 1.8 ms, rounded to 2ms
+        this.logger.debug("Flash powered on successfully");
+    }
     /**
      * Get security info including chip ID (ESP32-C3 and later)
      */
@@ -1318,21 +1358,17 @@ export class ESPLoader extends EventTarget {
                 const wdtResetUsed = await this.tryUsbWdtReset("ESP32-S2");
                 if (wdtResetUsed)
                     return;
-            }
-            else if (this.chipFamily === CHIP_FAMILY_ESP32S3) {
-                const wdtResetUsed = await this.tryUsbWdtReset("ESP32-S3");
-                if (wdtResetUsed)
-                    return;
+                //      } else if (this.chipFamily === CHIP_FAMILY_ESP32S3) {
+                //        const wdtResetUsed = await this.tryUsbWdtReset("ESP32-S3");
+                //        if (wdtResetUsed) return;
             }
             else if (this.chipFamily === CHIP_FAMILY_ESP32P4) {
                 const wdtResetUsed = await this.tryUsbWdtReset("ESP32-P4");
                 if (wdtResetUsed)
                     return;
-            }
-            else if (this.chipFamily === CHIP_FAMILY_ESP32C3) {
-                const wdtResetUsed = await this.tryUsbWdtReset("ESP32-C3");
-                if (wdtResetUsed)
-                    return;
+                //      } else if (this.chipFamily === CHIP_FAMILY_ESP32C3) {
+                //        const wdtResetUsed = await this.tryUsbWdtReset("ESP32-C3");
+                //        if (wdtResetUsed) return;
             }
             else if (this.chipFamily === CHIP_FAMILY_ESP32C5) {
                 const wdtResetUsed = await this.tryUsbWdtReset("ESP32-C5");
@@ -2301,6 +2337,7 @@ export class ESPLoader extends EventTarget {
         return await this.checkCommand(ESP_MEM_END, data, 0, timeout);
     }
     async runStub(skipFlashDetection = false) {
+        this.logger.debug(`Loading stub for ${this.chipName}, revision: ${this.chipRevision}`);
         const stub = await getStubCode(this.chipFamily, this.chipRevision);
         // No stub available for this chip, return ROM loader
         if (stub === null) {
@@ -2911,6 +2948,11 @@ export class ESPLoader extends EventTarget {
             if (!this.port.writable || !this.port.readable) {
                 throw new Error("Port not ready after reconnect");
             }
+            // Power on flash for ESP32-P4 Rev 301 (must be done before loading stub)
+            if (this.chipFamily === CHIP_FAMILY_ESP32P4 &&
+                this.chipRevision === 301) {
+                await this.powerOnFlash();
+            }
             // Load stub
             const stubLoader = await this.runStub(true);
             this.logger.debug("Stub loaded");