refactor(stub_flasher): Cleanup, make adding new targets easier

Jason2866 · Nov 1, 2023 · fb7f4db · fb7f4db
1 parent d266645
commit fb7f4db
Show file tree

Hide file tree

Showing 32 changed files with 80 additions and 282 deletions.
diff --git a/esptool/loader.py b/esptool/loader.py
@@ -184,8 +184,6 @@ class ESPLoader(object):
     CHIP_NAME = "Espressif device"
     IS_STUB = False
 
-    FPGA_SLOW_BOOT = False
-
     DEFAULT_PORT = "/dev/ttyUSB0"
 
     USES_RFC2217 = False
@@ -628,7 +626,7 @@ def _construct_reset_strategy_sequence(self, mode):
 
         # This FPGA delay is for Espressif internal use
         if (
-            self.FPGA_SLOW_BOOT
+            self.CHIP_NAME == "ESP32"
             and os.environ.get("ESPTOOL_ENV_FPGA", "").strip() == "1"
         ):
             delay = extra_delay = 7

diff --git a/esptool/targets/esp32.py b/esptool/targets/esp32.py
@@ -17,8 +17,6 @@ class ESP32ROM(ESPLoader):
     IMAGE_CHIP_ID = 0
     IS_STUB = False
 
-    FPGA_SLOW_BOOT = True
-
     CHIP_DETECT_MAGIC_VALUE = [0x00F01D83]
 
     IROM_MAP_START = 0x400D0000

diff --git a/esptool/targets/esp32c3.py b/esptool/targets/esp32c3.py
@@ -14,8 +14,6 @@ class ESP32C3ROM(ESP32ROM):
     CHIP_NAME = "ESP32-C3"
     IMAGE_CHIP_ID = 5
 
-    FPGA_SLOW_BOOT = False
-
     IROM_MAP_START = 0x42000000
     IROM_MAP_END = 0x42800000
     DROM_MAP_START = 0x3C000000

diff --git a/esptool/targets/esp32c6.py b/esptool/targets/esp32c6.py
@@ -13,8 +13,6 @@ class ESP32C6ROM(ESP32C3ROM):
     CHIP_NAME = "ESP32-C6"
     IMAGE_CHIP_ID = 13
 
-    FPGA_SLOW_BOOT = False
-
     IROM_MAP_START = 0x42000000
     IROM_MAP_END = 0x42800000
     DROM_MAP_START = 0x42800000

diff --git a/esptool/targets/esp32p4.py b/esptool/targets/esp32p4.py
@@ -14,8 +14,6 @@ class ESP32P4ROM(ESP32ROM):
     CHIP_NAME = "ESP32-P4"
     IMAGE_CHIP_ID = 18
 
-    FPGA_SLOW_BOOT = False
-
     IROM_MAP_START = 0x40000000
     IROM_MAP_END = 0x44000000
     DROM_MAP_START = 0x40000000

diff --git a/esptool/targets/esp32s2.py b/esptool/targets/esp32s2.py
@@ -16,8 +16,6 @@ class ESP32S2ROM(ESP32ROM):
     CHIP_NAME = "ESP32-S2"
     IMAGE_CHIP_ID = 2
 
-    FPGA_SLOW_BOOT = False
-
     IROM_MAP_START = 0x40080000
     IROM_MAP_END = 0x40B80000
     DROM_MAP_START = 0x3F000000

diff --git a/esptool/targets/esp32s3.py b/esptool/targets/esp32s3.py
@@ -19,8 +19,6 @@ class ESP32S3ROM(ESP32ROM):
 
     CHIP_DETECT_MAGIC_VALUE = [0x9]
 
-    FPGA_SLOW_BOOT = False
-
     IROM_MAP_START = 0x42000000
     IROM_MAP_END = 0x44000000
     DROM_MAP_START = 0x3C000000

diff --git a/flasher_stub/include/soc_support.h b/flasher_stub/include/soc_support.h
@@ -63,11 +63,16 @@
 #endif // ESP32P4
 
 // Increase CPU freq to speed up read/write operations over USB
-// Temporarily disabled on the S3 due to stability issues, will be fixed in the next minor release
+// Disabled on the S3 due to stability issues, would require dbias adjustment.
+// https://github.com/espressif/esptool/issues/832, https://github.com/espressif/esptool/issues/808
 #define USE_MAX_CPU_FREQ ((WITH_USB_JTAG_SERIAL || WITH_USB_OTG) && !ESP32S3)
 
+// Later chips don't support ets_efuse_get_spiconfig.
+#define SUPPORT_CONFIG_SPI (ESP32 || ESP32S2 || ESP32S3 || ESP32S3BETA2 || ESP32C3 || ESP32H2BETA1 || ESP32H2BETA2 || ESP32C6BETA)
+
 /**********************************************************
  * Per-SOC based peripheral register base addresses
+ * Sync with reg_base.h in ESP-IDF
  */
 #ifdef ESP8266
 #define UART_BASE_REG       0x60000000 /* UART0 */
@@ -380,21 +385,6 @@
  * SYSTEM registers
  */
 
-#ifdef ESP32S3
-#define SYSTEM_CPU_PER_CONF_REG       (SYSTEM_BASE_REG + 0x010)
-#define SYSTEM_CPUPERIOD_SEL_M        ((SYSTEM_CPUPERIOD_SEL_V)<<(SYSTEM_CPUPERIOD_SEL_S))
-#define SYSTEM_CPUPERIOD_SEL_V        0x3
-#define SYSTEM_CPUPERIOD_SEL_S        0
-#define SYSTEM_CPUPERIOD_MAX          1  // CPU_CLK frequency is 160 MHz - not actually max possible frequency,
-// see https://github.com/espressif/esptool/issues/832 and https://github.com/espressif/esptool/issues/808
-
-#define SYSTEM_SYSCLK_CONF_REG        (SYSTEM_BASE_REG + 0x060)
-#define SYSTEM_SOC_CLK_SEL_M          ((SYSTEM_SOC_CLK_SEL_V)<<(SYSTEM_SOC_CLK_SEL_S))
-#define SYSTEM_SOC_CLK_SEL_V          0x3
-#define SYSTEM_SOC_CLK_SEL_S          10
-#define SYSTEM_SOC_CLK_MAX            1
-#endif // ESP32S3
-
 #ifdef ESP32C3
 #define SYSTEM_CPU_PER_CONF_REG       (SYSTEM_BASE_REG + 0x008)
 #define SYSTEM_CPUPERIOD_SEL_M        ((SYSTEM_CPUPERIOD_SEL_V)<<(SYSTEM_CPUPERIOD_SEL_S))
@@ -450,3 +440,28 @@
 #if ESP32S3_OR_LATER
 #define SECURITY_INFO_BYTES 20
 #endif // ESP32S3_OR_LATER
+
+/**********************************************************
+ * Per-SOC address of the rom_spiflash_legacy_funcs symbol in ROM
+ * Can be retrieved with gdb: "info address rom_spiflash_legacy_funcs"
+ */
+
+#if ESP32 || ESP32S2 || ESP32S3
+#define ROM_SPIFLASH_LEGACY         0x3ffae270
+#endif // ESP32 || ESP32S2 || ESP32S3
+
+#if ESP32C3 || ESP32C6BETA || ESP32C2 || ESP32C6
+#define ROM_SPIFLASH_LEGACY         0x3fcdfff4
+#endif // ESP32C3 || ESP32C6BETA || ESP32C2 || ESP32C6
+
+#if ESP32H2BETA1 || ESP32H2BETA2
+#define ROM_SPIFLASH_LEGACY         0x3fcdfff0
+#endif // ESP32H2BETA1 || ESP32H2BETA2
+
+#if ESP32H2
+#define ROM_SPIFLASH_LEGACY         0x4084fff0
+#endif // ESP32H2
+
+#if ESP32P4
+#define ROM_SPIFLASH_LEGACY         0x4ff3ffec
+#endif // ESP32P4
diff --git a/flasher_stub/ld/rom_32h2.ld b/flasher_stub/ld/rom_32h2.ld
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
 /* ROM function interface esp32h2.rom.ld for esp32h2
  *
  *
@@ -22,7 +17,7 @@ PROVIDE ( SPI_read_status_high = esp_rom_spiflash_read_statushigh);
 PROVIDE ( SPI_write_status = esp_rom_spiflash_write_status);
 PROVIDE ( SPIRead = esp_rom_spiflash_read);
 PROVIDE ( SPIParamCfg = esp_rom_spiflash_config_param);
-PROVIDE ( SPIEraseChip = esp_rom_spiflash_erase_chip); 
+PROVIDE ( SPIEraseChip = esp_rom_spiflash_erase_chip);
 PROVIDE ( SPIEraseSector = esp_rom_spiflash_erase_sector);
 PROVIDE ( SPIEraseBlock = esp_rom_spiflash_erase_block);
 PROVIDE ( SPI_Write_Encrypt_Enable = esp_rom_spiflash_write_encrypted_enable);

diff --git a/flasher_stub/ld/stub_32.ld b/flasher_stub/ld/stub_32.ld
@@ -1,20 +1,3 @@
-/*
- * Copyright (c) 2016 Cesanta Software Limited
- * All rights reserved
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
- * Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
 /* Note: stub is deliberately loaded close to the very top
    of available RAM, to reduce change of colliding with anything
    else... */

diff --git a/flasher_stub/ld/stub_32c3.ld b/flasher_stub/ld/stub_32c3.ld
@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 MEMORY {
   iram : org = 0x40380000, len = 0x4000
   dram : org = 0x3FC84000, len = 0x18000

diff --git a/flasher_stub/ld/stub_32c6.ld b/flasher_stub/ld/stub_32c6.ld
@@ -1,20 +1,3 @@
-/*
- * Copyright (c) 2022 Espressif Systems (Shanghai) PTE LTD
- * All rights reserved
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
- * Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
 MEMORY {
   iram : org = 0x40800000, len = 0x4000
   dram : org = 0x40840000, len = 0x18000

diff --git a/flasher_stub/ld/stub_32c6_beta.ld b/flasher_stub/ld/stub_32c6_beta.ld
@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 MEMORY {
   iram : org = 0x40380000, len = 0x4000
   dram : org = 0x3FC84000, len = 0x18000

diff --git a/flasher_stub/ld/stub_32h2.ld b/flasher_stub/ld/stub_32h2.ld
@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 MEMORY {
   iram : org = 0x40800000, len = 0x4000
   dram : org = 0x40830000, len = 0x18000

diff --git a/flasher_stub/ld/stub_32h2_beta_1.ld b/flasher_stub/ld/stub_32h2_beta_1.ld
@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 MEMORY {
   iram : org = 0x40380000, len = 0x4000
   dram : org = 0x3FC84000, len = 0x18000

diff --git a/flasher_stub/ld/stub_32h2_beta_2.ld b/flasher_stub/ld/stub_32h2_beta_2.ld
@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 MEMORY {
   iram : org = 0x40380000, len = 0x4000
   dram : org = 0x3FC84000, len = 0x18000

diff --git a/flasher_stub/ld/stub_32p4.ld b/flasher_stub/ld/stub_32p4.ld
@@ -1,20 +1,3 @@
-/*
- * Copyright (c) 2023 Espressif Systems (Shanghai) PTE LTD
- * All rights reserved
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
- * Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
 MEMORY {
   iram : org = 0x4FF10000, len = 0x4000
   dram : org = 0x4FF50000, len = 0x18000

diff --git a/flasher_stub/ld/stub_32s2.ld b/flasher_stub/ld/stub_32s2.ld
@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 MEMORY {
   iram : org = 0x40028000, len = 0x18000
   dram : org = 0x3FFD0000, len = 0x28000

diff --git a/flasher_stub/ld/stub_32s3.ld b/flasher_stub/ld/stub_32s3.ld
@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 MEMORY {
   iram : org = 0x40378000, len = 0x18000
   dram : org = 0x3FCA0000, len = 0x28000

diff --git a/flasher_stub/ld/stub_32s3_beta_2.ld b/flasher_stub/ld/stub_32s3_beta_2.ld
@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 MEMORY {
   iram : org = 0x40378000, len = 0x18000
   dram : org = 0x3FCA0000, len = 0x28000

diff --git a/flasher_stub/ld/stub_8266.ld b/flasher_stub/ld/stub_8266.ld
@@ -1,20 +1,3 @@
-/*
- * Copyright (c) 2016 Cesanta Software Limited
- * All rights reserved
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
- * Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
 /* Note: stub is deliberately loaded close to the very top
    of available RAM, to reduce change of colliding with anything
    else... */