From ebbc91fd4f72219a16053610c6f264d27393f10d Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 18 Aug 2022 12:52:08 +0200 Subject: [PATCH 1/2] fix flash mode entrys for ESP32-S3 --- boards/esp32s3.json | 4 ++-- boards/esp32s3_8M.json | 4 ++-- boards/esp32s3cdc-box.json | 1 - boards/esp32s3cdc.json | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/boards/esp32s3.json b/boards/esp32s3.json index a498eb851..410a203ec 100644 --- a/boards/esp32s3.json +++ b/boards/esp32s3.json @@ -1,13 +1,13 @@ { "build": { "arduino":{ - "ldscript": "esp32s3_out.ld" + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_qspi" }, "core": "esp32", "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DESP32_4M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", - "flash_mode": "dio", "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" diff --git a/boards/esp32s3_8M.json b/boards/esp32s3_8M.json index 27000194c..62169df92 100644 --- a/boards/esp32s3_8M.json +++ b/boards/esp32s3_8M.json @@ -1,13 +1,13 @@ { "build": { "arduino":{ - "ldscript": "esp32s3_out.ld" + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_qspi" }, "core": "esp32", "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DESP32_8M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", - "flash_mode": "dio", "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2944k_fs2M.csv" diff --git a/boards/esp32s3cdc-box.json b/boards/esp32s3cdc-box.json index cbeafdc39..6afac543e 100644 --- a/boards/esp32s3cdc-box.json +++ b/boards/esp32s3cdc-box.json @@ -8,7 +8,6 @@ "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DUSE_USB_CDC_CONSOLE -DESP32_16M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", - "flash_mode": "dio", "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2944k_fs10M.csv" diff --git a/boards/esp32s3cdc.json b/boards/esp32s3cdc.json index a5280fb9d..3cafe0eea 100644 --- a/boards/esp32s3cdc.json +++ b/boards/esp32s3cdc.json @@ -1,13 +1,13 @@ { "build": { "arduino":{ - "ldscript": "esp32s3_out.ld" + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_qspi" }, "core": "esp32", "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", - "flash_mode": "dio", "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" From de1d32445c5c800e93d559c9c5faca8f6dc4479a Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 18 Aug 2022 13:00:52 +0200 Subject: [PATCH 2/2] flash_mode entry still needed --- boards/esp32s3.json | 1 + boards/esp32s3_8M.json | 1 + boards/esp32s3cdc-box.json | 1 + boards/esp32s3cdc.json | 1 + 4 files changed, 4 insertions(+) diff --git a/boards/esp32s3.json b/boards/esp32s3.json index 410a203ec..df9527c2c 100644 --- a/boards/esp32s3.json +++ b/boards/esp32s3.json @@ -8,6 +8,7 @@ "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DESP32_4M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" diff --git a/boards/esp32s3_8M.json b/boards/esp32s3_8M.json index 62169df92..46dea18ba 100644 --- a/boards/esp32s3_8M.json +++ b/boards/esp32s3_8M.json @@ -8,6 +8,7 @@ "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DESP32_8M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2944k_fs2M.csv" diff --git a/boards/esp32s3cdc-box.json b/boards/esp32s3cdc-box.json index 6afac543e..5388523be 100644 --- a/boards/esp32s3cdc-box.json +++ b/boards/esp32s3cdc-box.json @@ -8,6 +8,7 @@ "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DUSE_USB_CDC_CONSOLE -DESP32_16M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2944k_fs10M.csv" diff --git a/boards/esp32s3cdc.json b/boards/esp32s3cdc.json index 3cafe0eea..f4cb53cde 100644 --- a/boards/esp32s3cdc.json +++ b/boards/esp32s3cdc.json @@ -8,6 +8,7 @@ "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", + "flash_mode": "qio", "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv"