From 64a609eae2a6df1e62c9a0415d340a4b85d3fbc0 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 9 Nov 2022 11:57:34 +0100
Subject: [PATCH] Revert "`DIO` as default for ESP82xx"

This reverts commit 5673e11fac48d2fbc1786abfc7970a6c391b2b1c.
---
 CHANGELOG.md                 | 1 -
 README.md                    | 3 ++-
 boards/esp8266_1M.json       | 2 +-
 boards/esp8266_2M1M.json     | 2 +-
 boards/esp8266_2M256.json    | 2 +-
 boards/esp8266_4M2M.json     | 2 +-
 boards/esp8266_4M3M.json     | 2 +-
 boards/esp8266_zbbridge.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44082a12d..9edf22ad4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,6 @@ All notable changes to this project will be documented in this file.
 - Redesign distance sensors VL53LXX, TOF10120, HRXL and DYP to use cm instead of mm (#17021)
 
 ### Changed
-- Default Flash Mode changed from ``DOUT`` to ``DIO`` for ESP8266/ESP8285
 
 ### Fixed
 
diff --git a/README.md b/README.md
index 18b0bb143..48a099409 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,8 @@ Download one of the released binaries from http://ota.tasmota.com/tasmota/releas
 ## Important User Compilation Information
 If you want to compile Tasmota yourself keep in mind the following:
 
-- For ESP8285 based devices Flash Mode **DOUT** and **DIO** are supported. Do not use Flash Mode QIO / QOUT as it might seem to brick your device.
+- For ESP8285 based devices only Flash Mode **DOUT** is supported. Do not use Flash Mode DIO / QIO / QOUT as it might seem to brick your device.
+- For ESP8285 based devices Tasmota uses a 1M linker script WITHOUT spiffs **1M (no SPIFFS)** for optimal code space.
 - To make compile time changes to Tasmota use the `user_config_override.h` file. It assures keeping your custom settings when you download and compile a new version. You have to make a copy from the provided `user_config_override_sample.h` file and add your setting overrides.
 
 ## Configuration Information
diff --git a/boards/esp8266_1M.json b/boards/esp8266_1M.json
index 760b03535..6c3327ae7 100644
--- a/boards/esp8266_1M.json
+++ b/boards/esp8266_1M.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_1M",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp8266",
     "variant": "generic"
   },
diff --git a/boards/esp8266_2M1M.json b/boards/esp8266_2M1M.json
index f95bc00ee..3f34da721 100644
--- a/boards/esp8266_2M1M.json
+++ b/boards/esp8266_2M1M.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M1M",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp8266",
     "variant": "generic"
   },
diff --git a/boards/esp8266_2M256.json b/boards/esp8266_2M256.json
index 06357e92a..5ef9e86ae 100644
--- a/boards/esp8266_2M256.json
+++ b/boards/esp8266_2M256.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M256",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp8266",
     "variant": "generic"
   },
diff --git a/boards/esp8266_4M2M.json b/boards/esp8266_4M2M.json
index 69f561e01..9708b2621 100644
--- a/boards/esp8266_4M2M.json
+++ b/boards/esp8266_4M2M.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M2M",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp8266",
     "variant": "generic"
   },
diff --git a/boards/esp8266_4M3M.json b/boards/esp8266_4M3M.json
index 4001b852a..d1fe7e459 100644
--- a/boards/esp8266_4M3M.json
+++ b/boards/esp8266_4M3M.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M3M",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp8266",
     "variant": "generic"
   },
diff --git a/boards/esp8266_zbbridge.json b/boards/esp8266_zbbridge.json
index b4d76adff..726b71de3 100644
--- a/boards/esp8266_zbbridge.json
+++ b/boards/esp8266_zbbridge.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M256",
     "f_cpu": "160000000L",
     "f_flash": "40000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp8266",
     "variant": "generic"
   },