From f839a97fbb0bd7d19320053415ca0344b2ce5867 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 23 Oct 2025 18:55:19 +0200
Subject: [PATCH] all P4 boards have 16MB flash (#24046)

---
 boards/esp32p4.json                           | 10 ++--
 boards/esp32p4_ev.json                        | 47 -------------------
 boards/esp32p4ser.json                        | 10 ++--
 .../esp32_partition_app3904k_fs11584k.csv     |  6 +++
 4 files changed, 16 insertions(+), 57 deletions(-)
 delete mode 100644 boards/esp32p4_ev.json
 create mode 100644 partitions/esp32_partition_app3904k_fs11584k.csv

diff --git a/boards/esp32p4.json b/boards/esp32p4.json
index 56f0c2e54..a2778b650 100644
--- a/boards/esp32p4.json
+++ b/boards/esp32p4.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "esp32",
     "extra_flags": [
-      "-DARDUINO_TASMOTA -DESP32P4 -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE"
+      "-DARDUINO_TASMOTA -DESP32P4 -DESP32_16M -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE"
     ],
     "f_cpu": "360000000L",
     "f_flash": "80000000L",
@@ -10,7 +10,7 @@
     "flash_mode": "qio",
     "mcu": "esp32p4",
     "variant": "esp32p4",
-    "partitions": "partitions/esp32_partition_app2880k_fs320k.csv"
+    "partitions": "partitions/esp32_partition_app3904k_fs11584k.csv"
   },
   "connectivity": [
     "wifi",
@@ -25,7 +25,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "Espressif Generic ESP32-P4 >= 4M Flash, Tasmota 2880k Code/OTA, >= 320k FS",
+  "name": "Espressif Generic ESP32-P4 16M Flash, Tasmota 3904k Code/OTA, 11584k FS",
   "upload": {
     "arduino": {
       "flash_extra_images": [
@@ -35,9 +35,9 @@
         ]
       ]
     },
-    "flash_size": "4MB",
+    "flash_size": "16MB",
     "maximum_ram_size": 768000,
-    "maximum_size": 4194304,
+    "maximum_size": 16777216,
     "require_upload_port": true,
     "speed": 1500000
   },
diff --git a/boards/esp32p4_ev.json b/boards/esp32p4_ev.json
deleted file mode 100644
index 414ed068d..000000000
--- a/boards/esp32p4_ev.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "build": {
-    "core": "esp32",
-    "extra_flags": [
-      "-DARDUINO_TASMOTA -DESP32P4 -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE"
-    ],
-    "f_cpu": "360000000L",
-    "f_flash": "80000000L",
-    "f_psram": "200000000L",
-    "flash_mode": "qio",
-    "mcu": "esp32p4",
-    "variant": "esp32p4",
-    "partitions": "partitions/esp32_partition_app3904k_fs3392k.csv"
-  },
-  "connectivity": [
-    "wifi",
-    "bluetooth",
-    "openthread",
-    "ethernet"
-  ],
-  "debug": {
-    "openocd_target": "esp32p4.cfg"
-  },
-  "frameworks": [
-    "arduino",
-    "espidf"
-  ],
-  "name": "Espressif ESP32-P4 Function EV Board",
-  "upload": {
-    "arduino": {
-      "flash_extra_images": [
-        [
-          "0x10000",
-          "tasmota32p4-safeboot.bin"
-        ]
-      ]
-    },
-    "flash_size": "16MB",
-    "maximum_ram_size": 768000,
-    "maximum_size": 16777216,
-    "require_upload_port": true,
-    "speed": 1500000
-  },
-  "url": "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32p4/esp32-p4-function-ev-board/index.html",
-  "vendor": "Espressif"
-}
-
diff --git a/boards/esp32p4ser.json b/boards/esp32p4ser.json
index ec4ab9a3a..4eab15562 100644
--- a/boards/esp32p4ser.json
+++ b/boards/esp32p4ser.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "esp32",
     "extra_flags": [
-      "-DARDUINO_TASMOTA -DESP32P4 -DBOARD_HAS_PSRAM"
+      "-DARDUINO_TASMOTA -DESP32P4 -DESP32_16M -DBOARD_HAS_PSRAM"
     ],
     "f_cpu": "360000000L",
     "f_flash": "80000000L",
@@ -10,7 +10,7 @@
     "flash_mode": "qio",
     "mcu": "esp32p4",
     "variant": "esp32p4",
-    "partitions": "partitions/esp32_partition_app2880k_fs320k.csv"
+    "partitions": "partitions/esp32_partition_app3904k_fs11584k.csv"
   },
   "connectivity": [
     "wifi",
@@ -25,7 +25,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "Espressif Generic ESP32-P4 >= 4M Flash, Tasmota 2880k Code/OTA, >= 320k FS",
+  "name": "Espressif Generic ESP32-P4 16M Flash, Tasmota 3904k Code/OTA, 11584k FS",
   "upload": {
     "arduino": {
       "flash_extra_images": [
@@ -35,9 +35,9 @@
         ]
       ]
     },
-    "flash_size": "4MB",
+    "flash_size": "16MB",
     "maximum_ram_size": 768000,
-    "maximum_size": 4194304,
+    "maximum_size": 16777216,
     "require_upload_port": true,
     "speed": 1500000
   },
diff --git a/partitions/esp32_partition_app3904k_fs11584k.csv b/partitions/esp32_partition_app3904k_fs11584k.csv
new file mode 100644
index 000000000..eee93718a
--- /dev/null
+++ b/partitions/esp32_partition_app3904k_fs11584k.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+safeboot, app,  factory, 0x10000, 0xD0000,
+app0,     app,  ota_0,   0xE0000, 0x3D0000,
+spiffs,   data, spiffs,  0x4B0000,0xB50000,