Merge pull request #9564 from tannewt/qualia_glitches

jepler · web-flow · commit 14c86ef7d062 · 2024-08-27T19:24:01.000-05:00
Bump Qualia to 120 MHz flash and PSRAM speed
diff --git a/ports/espressif/boards/adafruit_qualia_s3_rgb666/mpconfigboard.mk b/ports/espressif/boards/adafruit_qualia_s3_rgb666/mpconfigboard.mk
@@ -7,10 +7,10 @@ IDF_TARGET = esp32s3
 
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
 CIRCUITPY_ESP_FLASH_MODE = qio
-CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_FREQ = 120m
 
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
-CIRCUITPY_ESP_PSRAM_FREQ = 80m
+CIRCUITPY_ESP_PSRAM_FREQ = 120m
 
 CIRCUITPY_DOTCLOCKFRAMEBUFFER = 1
diff --git a/ports/espressif/esp-idf-config/sdkconfig-flash-120m.defaults b/ports/espressif/esp-idf-config/sdkconfig-flash-120m.defaults
@@ -0,0 +1,15 @@
+CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
+# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_64M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_60M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_48M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_32M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_30M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_24M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_16M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_15M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ_80M_DEFAULT=y
+CONFIG_SPI_FLASH_UNDER_HIGH_FREQ=y
diff --git a/ports/espressif/tools/update_sdkconfig.py b/ports/espressif/tools/update_sdkconfig.py
@@ -76,9 +76,7 @@
     "CONFIG_ESPTOOLPY_FLASH_SAMBLE_MODE_",
 ]
 
-FLASH_FREQ_SETTINGS = [
-    "CONFIG_ESPTOOLPY_FLASHFREQ_",
-]
+FLASH_FREQ_SETTINGS = ["CONFIG_ESPTOOLPY_FLASHFREQ_", "CONFIG_SPI_FLASH_UNDER_HIGH_FREQ"]
 
 PSRAM_SETTINGS = ["CONFIG_SPIRAM"]
 

Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,7 @@`
`76`	`76`	`"CONFIG_ESPTOOLPY_FLASH_SAMBLE_MODE_",`
`77`	`77`	`]`
`78`	`78`
`79`		`-FLASH_FREQ_SETTINGS = [`
`80`		`- "CONFIG_ESPTOOLPY_FLASHFREQ_",`
`81`		`-]`
	`79`	`+FLASH_FREQ_SETTINGS = ["CONFIG_ESPTOOLPY_FLASHFREQ_", "CONFIG_SPI_FLASH_UNDER_HIGH_FREQ"]`
`82`	`80`
`83`	`81`	`PSRAM_SETTINGS = ["CONFIG_SPIRAM"]`
`84`	`82`