From 616a550628b6b35986a789bf774929e7bb80a8f1 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 29 Apr 2024 16:07:20 +0200
Subject: [PATCH] Revert "S3 OPI tweak LCD RGB parallel speed"

This reverts commit 01dcb26c20c98bcbb96e7da63f5095b10c7bf6da.
---
 configs/builds.json       | 13 +++++++++++--
 configs/defconfig.common  |  1 -
 configs/defconfig.dout    |  1 +
 configs/defconfig.esp32   |  2 +-
 configs/defconfig.esp32c2 |  4 +---
 configs/defconfig.esp32c6 |  2 --
 configs/defconfig.opi_ram |  9 ---------
 configs/defconfig.qout    |  1 +
 8 files changed, 15 insertions(+), 18 deletions(-)
 create mode 100644 configs/defconfig.dout
 create mode 100644 configs/defconfig.qout

diff --git a/configs/builds.json b/configs/builds.json
index 47786817b..02695519c 100644
--- a/configs/builds.json
+++ b/configs/builds.json
@@ -131,17 +131,26 @@
 		{
 			"target": "esp32s3",
 			"features":[],
-			"idf_libs":["qio","120m","opi_ram"],
+			"idf_libs":["qio","80m","opi_ram"],
 			"bootloaders":[
 				["qio","120m","qio_ram"],
+				["qio","120m","opi_ram"],
 				["qio","80m","qio_ram"],
+                                ["qio","80m","opi_ram"],
+				["opi","120m","qio_ram"],
 				["opi","120m","opi_ram"],
+				["opi","80m","qio_ram"],
 				["opi","80m","opi_ram"]
 			],
 			"mem_variants":[
 				["qio","120m","qio_ram"],
+				["qio","120m","opi_ram"],
+				["qio","80m","qio_ram"],
+                                ["qio","80m","opi_ram"],
+				["opi","120m","qio_ram"],
 				["opi","120m","opi_ram"],
-				["opi","120m","qio_ram"]
+				["opi","80m","qio_ram"],
+				["opi","80m","opi_ram"]
 			]
 		}
 	]
diff --git a/configs/defconfig.common b/configs/defconfig.common
index 628749a05..4a2be049d 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -16,7 +16,6 @@ CONFIG_TEMP_SENSOR_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
-CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
 # CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
 # CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set
diff --git a/configs/defconfig.dout b/configs/defconfig.dout
new file mode 100644
index 000000000..48d652cc2
--- /dev/null
+++ b/configs/defconfig.dout
@@ -0,0 +1 @@
+CONFIG_ESPTOOLPY_FLASHMODE_DOUT=y
\ No newline at end of file
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index 2b41cdb3d..d15399735 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -4,7 +4,7 @@
 CONFIG_BT_ENABLED=y
 CONFIG_BT_STACK_NO_LOG=y
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
-# CONFIG_BLE_MESH is not set
+# CONFIG_BLE_MESH is not set 
 CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
 CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
diff --git a/configs/defconfig.esp32c2 b/configs/defconfig.esp32c2
index 6179c84f2..b0cb51820 100644
--- a/configs/defconfig.esp32c2
+++ b/configs/defconfig.esp32c2
@@ -1,15 +1,13 @@
 CONFIG_XTAL_FREQ_26=y
 CONFIG_XTAL_FREQ=26
 
-CONFIG_COMPILER_FLOAT_LIB_FROM_RVFPLIB=y
-
 #
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
 CONFIG_BT_STACK_NO_LOG=y
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
-# CONFIG_BLE_MESH is not set
+# CONFIG_BLE_MESH is not set 
 CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
 CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6
index e950a2489..f2cfcded3 100644
--- a/configs/defconfig.esp32c6
+++ b/configs/defconfig.esp32c6
@@ -1,8 +1,6 @@
 # C6 has full Newlib in Rom
 # CONFIG_NEWLIB_NANO_FORMAT is not set
 
-CONFIG_COMPILER_FLOAT_LIB_FROM_RVFPLIB=y
-
 # Enable LP Core
 CONFIG_ULP_COPROC_ENABLED=y
 CONFIG_ULP_COPROC_TYPE_LP_CORE=y
diff --git a/configs/defconfig.opi_ram b/configs/defconfig.opi_ram
index a0309da41..ad5646526 100644
--- a/configs/defconfig.opi_ram
+++ b/configs/defconfig.opi_ram
@@ -1,12 +1,3 @@
 CONFIG_SPIRAM_MODE_OCT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 # CONFIG_SPIRAM_MEMTEST is not set
-CONFIG_LCD_RGB_ISR_IRAM_SAFE=y
-CONFIG_GDMA_CTRL_FUNC_IN_IRAM=y
-# bounce buffer mode relies on GDMA EOF interrupt to be service-able
-CONFIG_GDMA_ISR_IRAM_SAFE=y
-# place non-ISR FreeRTOS functions in Flash
-CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
-# Enable the XIP-PSRAM feature, so the ext-mem cache won't be disabled when SPI1 is operating the main flash
-CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y
-CONFIG_SPIRAM_RODATA=y
diff --git a/configs/defconfig.qout b/configs/defconfig.qout
new file mode 100644
index 000000000..154cabf41
--- /dev/null
+++ b/configs/defconfig.qout
@@ -0,0 +1 @@
+CONFIG_ESPTOOLPY_FLASHMODE_QOUT=y
\ No newline at end of file