From fe035eea4710209fc7b81fb5c5f896426ffbd808 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 18 Apr 2021 11:55:16 +0200
Subject: [PATCH 1/2] remove redundant

---
 platformio.ini               | 3 +--
 platformio_tasmota32.ini     | 1 -
 platformio_tasmota_env.ini   | 3 +--
 platformio_tasmota_env32.ini | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 97e8fe901..53d49d864 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -28,7 +28,7 @@ extra_configs               = platformio_tasmota32.ini
 framework                   = arduino
 board_build.filesystem      = littlefs
 custom_unpack_dir           = unpacked_littlefs
-board_build.flash_mode      = dout
+board                       = esp8266_1M
 platform                    = ${core.platform}
 platform_packages           = ${core.platform_packages}
 build_unflags               = ${core.build_unflags}
@@ -86,7 +86,6 @@ build_flags                 = -DCORE_DEBUG_LEVEL=0
 
 
 [esp82xx_defaults]
-board                       = esp8266_1M
 build_flags                 = ${esp_defaults.build_flags}
                               -DNDEBUG
                               -DFP_IN_IROM
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index 0391e8c85..798e12be9 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -11,7 +11,6 @@ board                       = esp32dev
 board_build.filesystem      = ${common.board_build.filesystem}
 custom_unpack_dir           = ${common.custom_unpack_dir}
 board_build.partitions      = esp32_partition_app1856k_spiffs320k.csv
-board_build.flash_mode      = ${common.board_build.flash_mode}
 board_build.f_flash         = ${common.board_build.f_flash}
 board_build.f_cpu           = ${common.board_build.f_cpu}
 monitor_speed               = 115200
diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index c0b3e7294..ce3b07144 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -2,9 +2,8 @@
 platform                = ${common.platform}
 platform_packages       = ${common.platform_packages}
 framework               = ${common.framework}
-board                   = ${esp82xx_defaults.board}
+board                   = ${common.board}
 board_build.filesystem  = ${common.board_build.filesystem}
-board_build.flash_mode  = ${common.board_build.flash_mode}
 board_build.f_flash     = ${common.board_build.f_flash}
 board_build.f_cpu       = ${common.board_build.f_cpu}
 build_unflags           = ${common.build_unflags}
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 3a44b2675..5fcce4ee5 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -4,7 +4,6 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.partitions  = ${common32.board_build.partitions}
-board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_flash     = ${common32.board_build.f_flash}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}

From ae0eeaeed6cd34ffd07fb86d6d7f7f9f7ae3a0b1 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 18 Apr 2021 12:21:13 +0200
Subject: [PATCH 2/2] remove 3M SPIFFS variant

---
 platformio_override_sample.ini | 2 --
 1 file changed, 2 deletions(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index a674fad2d..90eded0e6 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -58,8 +58,6 @@ build_flags                 = ${core.build_flags}
 ;board                       = esp8266_1M
 ; Build variant 2MB = 1MB firmware, 1MB filesystem (most Shelly devices)
 ;board                       = esp8266_2M1M
-; Build variant 4MB = 1MB firmware, 3MB filesystem (WEMOS D1 Mini, NodeMCU, Sonoff POW)
-;board                       = esp8266_4M3M
 ; Build variant 4MB = 1MB firmware, 1MB OTA, 2MB filesystem (WEMOS D1 Mini, NodeMCU, Sonoff POW)
 ;board                       = esp8266_4M2M