From 1400178ec6c10935613c373ebc9685080432cb95 Mon Sep 17 00:00:00 2001 From: Valerii Koval Date: Mon, 26 Sep 2022 15:23:00 +0300 Subject: [PATCH] Synchronize board settings according to the latest Arduino core --- boards/adafruit_feather_esp32_v2.json | 6 ++++-- boards/adafruit_feather_esp32s3.json | 3 ++- boards/adafruit_feather_esp32s3_nopsram.json | 3 ++- boards/adafruit_qtpy_esp32.json | 6 ++++-- boards/adafruit_qtpy_esp32c3.json | 2 +- boards/alksesp32.json | 6 +++--- boards/bpi-bit.json | 4 ++-- boards/d-duino-32.json | 4 ++-- boards/deneyapkart.json | 6 +++--- boards/deneyapkart1A.json | 6 +++--- boards/dpu_esp32.json | 4 ++-- boards/esp32-devkitlipo.json | 4 ++-- boards/espectro32.json | 4 ++-- boards/featheresp32-s2.json | 2 +- boards/featheresp32.json | 2 +- boards/frogboard.json | 4 ++-- boards/kb32-ft.json | 4 ++-- boards/labplus_mpython.json | 4 ++-- boards/m5stack-core-esp32.json | 4 ++-- boards/mgbot-iotik32a.json | 4 ++-- boards/mgbot-iotik32b.json | 4 ++-- boards/nscreen-32.json | 4 ++-- boards/odroid_esp32.json | 4 ++-- boards/sparkfun_esp32micromod.json | 4 ++-- boards/sparkfun_lora_gateway_1-channel.json | 4 ++-- boards/tinypico.json | 4 ++-- boards/trueverit-iot-driver-mk3.json | 4 ++-- boards/ttgo-t7-v13-mini32.json | 4 ++-- boards/ttgo-t7-v14-mini32.json | 4 ++-- boards/um_feathers3.json | 3 ++- boards/um_pros3.json | 3 ++- boards/um_tinys3.json | 3 ++- boards/upesy_wroom.json | 4 ++-- boards/upesy_wrover.json | 4 ++-- boards/wt32-eth01.json | 4 ++-- boards/xinabox_cw02.json | 4 ++-- 36 files changed, 76 insertions(+), 67 deletions(-) diff --git a/boards/adafruit_feather_esp32_v2.json b/boards/adafruit_feather_esp32_v2.json index a45636e..9414b99 100644 --- a/boards/adafruit_feather_esp32_v2.json +++ b/boards/adafruit_feather_esp32_v2.json @@ -1,17 +1,19 @@ { "build": { - "arduino":{ + "arduino": { "ldscript": "esp32_out.ld" }, "core": "esp32", "extra_flags": [ "-DARDUINO_ADAFRUIT_FEATHER_ESP32_V2", "-DBOARD_HAS_PSRAM", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1", "-mfix-esp32-psram-cache-issue", "-mfix-esp32-psram-cache-strategy=memw" ], "f_cpu": "240000000L", - "f_flash": "40000000L", + "f_flash": "80000000L", "flash_mode": "dio", "mcu": "esp32", "variant": "adafruit_feather_esp32_v2" diff --git a/boards/adafruit_feather_esp32s3.json b/boards/adafruit_feather_esp32s3.json index 9c14bd3..bca896c 100644 --- a/boards/adafruit_feather_esp32s3.json +++ b/boards/adafruit_feather_esp32s3.json @@ -9,7 +9,8 @@ "-DARDUINO_ADAFRUIT_FEATHER_ESP32S3", "-DARDUINO_USB_CDC_ON_BOOT=1", "-DARDUINO_RUNNING_CORE=1", - "-DARDUINO_EVENT_RUNNING_CORE=1" + "-DARDUINO_EVENT_RUNNING_CORE=1", + "-DBOARD_HAS_PSRAM" ], "f_cpu": "240000000L", "f_flash": "80000000L", diff --git a/boards/adafruit_feather_esp32s3_nopsram.json b/boards/adafruit_feather_esp32s3_nopsram.json index 29541e5..e20c3a3 100644 --- a/boards/adafruit_feather_esp32s3_nopsram.json +++ b/boards/adafruit_feather_esp32s3_nopsram.json @@ -1,7 +1,8 @@ { "build": { "arduino":{ - "ldscript": "esp32s3_out.ld" + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_qspi" }, "core": "esp32", "extra_flags": [ diff --git a/boards/adafruit_qtpy_esp32.json b/boards/adafruit_qtpy_esp32.json index 39896da..d2371f7 100644 --- a/boards/adafruit_qtpy_esp32.json +++ b/boards/adafruit_qtpy_esp32.json @@ -1,17 +1,19 @@ { "build": { - "arduino":{ + "arduino": { "ldscript": "esp32_out.ld" }, "core": "esp32", "extra_flags": [ "-DARDUINO_ADAFRUIT_QTPY_ESP32_PICO", "-DBOARD_HAS_PSRAM", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1", "-mfix-esp32-psram-cache-issue", "-mfix-esp32-psram-cache-strategy=memw" ], "f_cpu": "240000000L", - "f_flash": "40000000L", + "f_flash": "80000000L", "flash_mode": "dio", "mcu": "esp32", "variant": "adafruit_qtpy_esp32" diff --git a/boards/adafruit_qtpy_esp32c3.json b/boards/adafruit_qtpy_esp32c3.json index 335002d..7c870e0 100644 --- a/boards/adafruit_qtpy_esp32c3.json +++ b/boards/adafruit_qtpy_esp32c3.json @@ -11,7 +11,7 @@ ], "f_cpu": "160000000L", "f_flash": "80000000L", - "flash_mode": "dout", + "flash_mode": "qio", "hwids": [ [ "0X303A", diff --git a/boards/alksesp32.json b/boards/alksesp32.json index 6a4ae15..d94ec71 100644 --- a/boards/alksesp32.json +++ b/boards/alksesp32.json @@ -1,13 +1,13 @@ { "build": { - "arduino":{ + "arduino": { "ldscript": "esp32_out.ld" }, "core": "esp32", "extra_flags": "-DARDUINO_ALKS", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "alksesp32" }, diff --git a/boards/bpi-bit.json b/boards/bpi-bit.json index 5414abc..ec5c0dc 100644 --- a/boards/bpi-bit.json +++ b/boards/bpi-bit.json @@ -1,12 +1,12 @@ { "build": { - "arduino":{ + "arduino": { "ldscript": "esp32_out.ld" }, "core": "esp32", "extra_flags": "-DARDUINO_BPI_BIT", "f_cpu": "160000000L", - "f_flash": "40000000L", + "f_flash": "80000000L", "flash_mode": "dio", "mcu": "esp32", "variant": "bpi-bit" diff --git a/boards/d-duino-32.json b/boards/d-duino-32.json index 43bc24a..e4d92e3 100644 --- a/boards/d-duino-32.json +++ b/boards/d-duino-32.json @@ -1,12 +1,12 @@ { "build": { - "arduino":{ + "arduino": { "ldscript": "esp32_out.ld" }, "core": "esp32", "extra_flags": "-DARDUINO_D_DUINO_32", "f_cpu": "240000000L", - "f_flash": "40000000L", + "f_flash": "80000000L", "flash_mode": "dio", "mcu": "esp32", "variant": "d-duino-32" diff --git a/boards/deneyapkart.json b/boards/deneyapkart.json index 3114c03..018813d 100644 --- a/boards/deneyapkart.json +++ b/boards/deneyapkart.json @@ -1,6 +1,6 @@ { "build": { - "arduino":{ + "arduino": { "ldscript": "esp32_out.ld" }, "core": "esp32", @@ -11,8 +11,8 @@ "-mfix-esp32-psram-cache-strategy=memw" ], "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "deneyapkart" }, diff --git a/boards/deneyapkart1A.json b/boards/deneyapkart1A.json index 4369508..8aac188 100644 --- a/boards/deneyapkart1A.json +++ b/boards/deneyapkart1A.json @@ -1,6 +1,6 @@ { "build": { - "arduino":{ + "arduino": { "ldscript": "esp32_out.ld" }, "core": "esp32", @@ -11,8 +11,8 @@ "-mfix-esp32-psram-cache-strategy=memw" ], "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "deneyapkart1A" }, diff --git a/boards/dpu_esp32.json b/boards/dpu_esp32.json index 1d6ed4e..1f5b89a 100644 --- a/boards/dpu_esp32.json +++ b/boards/dpu_esp32.json @@ -12,8 +12,8 @@ "-mfix-esp32-psram-cache-strategy=memw" ], "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "dpu_esp32" }, diff --git a/boards/esp32-devkitlipo.json b/boards/esp32-devkitlipo.json index cbc926b..419edfd 100644 --- a/boards/esp32-devkitlipo.json +++ b/boards/esp32-devkitlipo.json @@ -1,12 +1,12 @@ { "build": { - "arduino":{ + "arduino": { "ldscript": "esp32_out.ld" }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEVKIT_LIPO", "f_cpu": "240000000L", - "f_flash": "40000000L", + "f_flash": "80000000L", "flash_mode": "qio", "hwids": [["0x1A86", "0x7523"]], "mcu": "esp32", diff --git a/boards/espectro32.json b/boards/espectro32.json index 7a88b3b..973c608 100644 --- a/boards/espectro32.json +++ b/boards/espectro32.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_ESPECTRO32", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "espectro32" }, diff --git a/boards/featheresp32-s2.json b/boards/featheresp32-s2.json index f645bf6..6933ccb 100644 --- a/boards/featheresp32-s2.json +++ b/boards/featheresp32-s2.json @@ -11,7 +11,7 @@ ], "f_cpu": "240000000L", "f_flash": "80000000L", - "flash_mode": "dio", + "flash_mode": "qio", "hwids": [ [ "0x239A", diff --git a/boards/featheresp32.json b/boards/featheresp32.json index d6d3b18..ac922db 100644 --- a/boards/featheresp32.json +++ b/boards/featheresp32.json @@ -6,7 +6,7 @@ "core": "esp32", "extra_flags": "-DARDUINO_FEATHER_ESP32", "f_cpu": "240000000L", - "f_flash": "40000000L", + "f_flash": "80000000L", "flash_mode": "dio", "mcu": "esp32", "variant": "feather_esp32" diff --git a/boards/frogboard.json b/boards/frogboard.json index b19e802..93a7729 100644 --- a/boards/frogboard.json +++ b/boards/frogboard.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_FROG_ESP32", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "frog32" }, diff --git a/boards/kb32-ft.json b/boards/kb32-ft.json index 586494f..4bfab5e 100644 --- a/boards/kb32-ft.json +++ b/boards/kb32-ft.json @@ -11,8 +11,8 @@ "-mfix-esp32-psram-cache-strategy=memw" ], "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "esp32" }, diff --git a/boards/labplus_mpython.json b/boards/labplus_mpython.json index 255edcc..3d3a4ff 100644 --- a/boards/labplus_mpython.json +++ b/boards/labplus_mpython.json @@ -7,8 +7,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "mpython" }, diff --git a/boards/m5stack-core-esp32.json b/boards/m5stack-core-esp32.json index c80f228..8d015f4 100644 --- a/boards/m5stack-core-esp32.json +++ b/boards/m5stack-core-esp32.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_M5Stack_Core_ESP32", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "m5stack_core_esp32" }, diff --git a/boards/mgbot-iotik32a.json b/boards/mgbot-iotik32a.json index 7cab2a5..b4dc416 100644 --- a/boards/mgbot-iotik32a.json +++ b/boards/mgbot-iotik32a.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_MGBOT_IOTIK32A", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "mgbot-iotik32a" }, diff --git a/boards/mgbot-iotik32b.json b/boards/mgbot-iotik32b.json index 86e1cce..15f3d85 100644 --- a/boards/mgbot-iotik32b.json +++ b/boards/mgbot-iotik32b.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_MGBOT_IOTIK32B", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "mgbot-iotik32b" }, diff --git a/boards/nscreen-32.json b/boards/nscreen-32.json index 07cfcc8..d9b3a40 100644 --- a/boards/nscreen-32.json +++ b/boards/nscreen-32.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "hwids": [ [ "0x0403", diff --git a/boards/odroid_esp32.json b/boards/odroid_esp32.json index 74a9398..0634df3 100644 --- a/boards/odroid_esp32.json +++ b/boards/odroid_esp32.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_ODROID_ESP32 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "odroid_esp32" }, diff --git a/boards/sparkfun_esp32micromod.json b/boards/sparkfun_esp32micromod.json index 2d0f52e..16fb0f1 100644 --- a/boards/sparkfun_esp32micromod.json +++ b/boards/sparkfun_esp32micromod.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_ESP32_MICROMOD", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "esp32micromod" }, diff --git a/boards/sparkfun_lora_gateway_1-channel.json b/boards/sparkfun_lora_gateway_1-channel.json index 8d6cc71..16eb843 100644 --- a/boards/sparkfun_lora_gateway_1-channel.json +++ b/boards/sparkfun_lora_gateway_1-channel.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "sparkfun_lora_gateway_1-channel" }, diff --git a/boards/tinypico.json b/boards/tinypico.json index 9f3deea..0b1302e 100644 --- a/boards/tinypico.json +++ b/boards/tinypico.json @@ -11,8 +11,8 @@ "-mfix-esp32-psram-cache-strategy=memw" ], "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "um_tinypico" }, diff --git a/boards/trueverit-iot-driver-mk3.json b/boards/trueverit-iot-driver-mk3.json index c74f960..0b394a7 100644 --- a/boards/trueverit-iot-driver-mk3.json +++ b/boards/trueverit-iot-driver-mk3.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_Trueverit_ESP32_Universal_IoT_Driver_MK_III", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "esp32-trueverit-iot-driver-mkiii" }, diff --git a/boards/ttgo-t7-v13-mini32.json b/boards/ttgo-t7-v13-mini32.json index 531dbb7..21552df 100644 --- a/boards/ttgo-t7-v13-mini32.json +++ b/boards/ttgo-t7-v13-mini32.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_TTGO_T7_V13_Mini32", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "ttgo-t7-v13-mini32" }, diff --git a/boards/ttgo-t7-v14-mini32.json b/boards/ttgo-t7-v14-mini32.json index a5d5a7a..23d3271 100644 --- a/boards/ttgo-t7-v14-mini32.json +++ b/boards/ttgo-t7-v14-mini32.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_TTGO_T7_V14_Mini32", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "ttgo-t7-v14-mini32" }, diff --git a/boards/um_feathers3.json b/boards/um_feathers3.json index 4351234..4430f59 100644 --- a/boards/um_feathers3.json +++ b/boards/um_feathers3.json @@ -2,7 +2,8 @@ "build": { "arduino":{ "ldscript": "esp32s3_out.ld", - "partitions": "default_16MB.csv" + "partitions": "default_16MB.csv", + "memory_type": "qio_qspi" }, "core": "esp32", "extra_flags": [ diff --git a/boards/um_pros3.json b/boards/um_pros3.json index e4ba4ee..d6fb529 100644 --- a/boards/um_pros3.json +++ b/boards/um_pros3.json @@ -2,7 +2,8 @@ "build": { "arduino": { "ldscript": "esp32s3_out.ld", - "partitions": "default_16MB.csv" + "partitions": "default_16MB.csv", + "memory_type": "qio_qspi" }, "core": "esp32", "extra_flags": [ diff --git a/boards/um_tinys3.json b/boards/um_tinys3.json index 7a72da4..6a9e3c1 100644 --- a/boards/um_tinys3.json +++ b/boards/um_tinys3.json @@ -2,7 +2,8 @@ "build": { "arduino":{ "ldscript": "esp32s3_out.ld", - "partitions": "default_8MB.csv" + "partitions": "default_8MB.csv", + "memory_type": "qio_qspi" }, "core": "esp32", "extra_flags": [ diff --git a/boards/upesy_wroom.json b/boards/upesy_wroom.json index 999cef7..5d25532 100644 --- a/boards/upesy_wroom.json +++ b/boards/upesy_wroom.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_uPesy_WROOM", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "uPesy_esp32_wroom_devkit" }, diff --git a/boards/upesy_wrover.json b/boards/upesy_wrover.json index 38b2eb3..5eb0e0f 100644 --- a/boards/upesy_wrover.json +++ b/boards/upesy_wrover.json @@ -11,8 +11,8 @@ "-mfix-esp32-psram-cache-strategy=memw" ], "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "uPesy_esp32_wrover_devkit" }, diff --git a/boards/wt32-eth01.json b/boards/wt32-eth01.json index e5a5192..3fddb34 100644 --- a/boards/wt32-eth01.json +++ b/boards/wt32-eth01.json @@ -8,8 +8,8 @@ "-DARDUINO_WT32_ETH01" ], "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "wt32-eth01" }, diff --git a/boards/xinabox_cw02.json b/boards/xinabox_cw02.json index 88785ab..527956b 100644 --- a/boards/xinabox_cw02.json +++ b/boards/xinabox_cw02.json @@ -6,8 +6,8 @@ "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", + "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32", "variant": "xinabox" },