feat: 增加16M flash的ESP32固件配置

BunnySakura · Sep 8, 2024 · 64c6593 · 64c6593
1 parent 3033eff
commit 64c6593
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 2 deletions.
diff --git a/ports/esp32/boards/GENERIC_16M/board.json b/ports/esp32/boards/GENERIC_16M/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "WiFi"
+    ],
+    "id": "esp32",
+    "images": [
+        "esp32_devkitc.jpg"
+    ],
+    "mcu": "esp32",
+    "product": "ESP32",
+    "thumbnail": "",
+    "url": "https://www.espressif.com/en/products/modules",
+    "variants": {
+        "idf3": "Compiled with IDF 3.x"
+    },
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC_16M/board.md b/ports/esp32/boards/GENERIC_16M/board.md
@@ -0,0 +1,3 @@
+The following files are daily firmware for ESP32-based boards without external SPIRAM.
+
+This firmware is compiled using ESP-IDF v4.x. Some older releases are also provided that are compiled with ESP-IDF v3.x.
diff --git a/ports/esp32/boards/GENERIC_16M/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_16M/mpconfigboard.cmake
@@ -0,0 +1,5 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+    boards/GENERIC_16M/sdkconfig.board
+)
diff --git a/ports/esp32/boards/GENERIC_16M/mpconfigboard.h b/ports/esp32/boards/GENERIC_16M/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "ESP32 module"
+#define MICROPY_HW_MCU_NAME "ESP32"
diff --git a/ports/esp32/boards/GENERIC_16M/sdkconfig.board b/ports/esp32/boards/GENERIC_16M/sdkconfig.board
@@ -0,0 +1,19 @@
+# 16 MB flash
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
+
+# Fast flash
+
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESP32_REV_MIN_1=y
+
+# OTA
+
+CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB-ota.csv"
+
diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
@@ -213,8 +213,8 @@ STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_phy_mode_obj, 0, 1, esp_phy_mode);
 
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
-#define TEST_WIFI_AUTH_MAX 9
+#define TEST_WIFI_AUTH_MAX 10
 #else
-#define TEST_WIFI_AUTH_MAX 8
+#define TEST_WIFI_AUTH_MAX 10
 #endif
 _Static_assert(WIFI_AUTH_MAX == TEST_WIFI_AUTH_MAX, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");