Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed instances where qspi has been renamed to qio in boards.txt #6962

Merged
merged 5 commits into from
Jul 18, 2022
Merged

Fixed instances where qspi has been renamed to qio in boards.txt #6962

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5f8f90
Fixed instances where qspi has been renamed to qio in boards.txt
lbernstone Jul 9, 2022
9b3ab54
Reverting commit 666c66d of July 6th 2022
SuGlider Jul 12, 2022
87699b1
reverting last commit
SuGlider Jul 12, 2022
07a14e6
Merge branch 'master' into qspi=>qio
SuGlider Jul 17, 2022
a48c57b
Merge branch 'master' into qspi=>qio
SuGlider Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,7 +1096,7 @@ esp32s3box.build.flash_mode=dio
esp32s3box.build.boot=qio
esp32s3box.build.partitions=default
esp32s3box.build.defines=-DBOARD_HAS_PSRAM
esp32s3box.build.memory_type=qspi_opi
esp32s3box.build.memory_type=qio_opi
esp32s3box.build.loop_core=-DARDUINO_RUNNING_CORE=1
esp32s3box.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1

Expand Down Expand Up @@ -1207,7 +1207,7 @@ esp32s3usbotg.build.flash_mode=dio
esp32s3usbotg.build.boot=qio
esp32s3usbotg.build.partitions=default
esp32s3usbotg.build.defines=
esp32s3usbotg.build.memory_type=qspi_qspi
esp32s3usbotg.build.memory_type=qio_qspi
esp32s3usbotg.build.loop_core=-DARDUINO_RUNNING_CORE=1
esp32s3usbotg.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1

Expand Down Expand Up @@ -2290,9 +2290,9 @@ tinys3.build.partitions=default
tinys3.build.defines=
tinys3.build.loop_core=
tinys3.build.event_core=
tinys3.build.flash_type=qspi
tinys3.build.flash_type=qio
tinys3.build.psram_type=qspi
tinys3.build.memory_type=qspi_qspi
tinys3.build.memory_type=qio_qspi

tinys3.menu.LoopCore.1=Core 1
tinys3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
Expand Down Expand Up @@ -2437,9 +2437,9 @@ pros3.build.partitions=default
pros3.build.defines=
pros3.build.loop_core=
pros3.build.event_core=
pros3.build.flash_type=qspi
pros3.build.flash_type=qio
pros3.build.psram_type=qspi
pros3.build.memory_type=qspi_qspi
pros3.build.memory_type=qio_qspi

pros3.menu.LoopCore.1=Core 1
pros3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
Expand Down Expand Up @@ -2593,9 +2593,9 @@ feathers3.build.partitions=default
feathers3.build.defines=
feathers3.build.loop_core=
feathers3.build.event_core=
feathers3.build.flash_type=qspi
feathers3.build.flash_type=qio
feathers3.build.psram_type=qspi
feathers3.build.memory_type=qspi_qspi
feathers3.build.memory_type=qio_qspi

feathers3.menu.LoopCore.1=Core 1
feathers3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
Expand Down Expand Up @@ -5903,7 +5903,7 @@ dfrobot_firebeetle2_esp32s3.build.partitions=default
dfrobot_firebeetle2_esp32s3.build.defines=
dfrobot_firebeetle2_esp32s3.build.loop_core=
dfrobot_firebeetle2_esp32s3.build.event_core=
dfrobot_firebeetle2_esp32s3.build.flash_type=qspi
dfrobot_firebeetle2_esp32s3.build.flash_type=qio
dfrobot_firebeetle2_esp32s3.build.psram_type=qspi
dfrobot_firebeetle2_esp32s3.build.memory_type={build.flash_type}_{build.psram_type}

Expand All @@ -5922,19 +5922,19 @@ dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio.build.flash_mode=dio
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio.build.boot=qio
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio.build.boot_freq=80m
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio.build.flash_freq=80m
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio.build.flash_type=qspi
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio.build.flash_type=qio
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120=QIO 120MHz
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120.build.flash_mode=dio
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120.build.boot=qio
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120.build.boot_freq=120m
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120.build.flash_freq=80m
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120.build.flash_type=qspi
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120.build.flash_type=qio
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio=DIO 80MHz
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio.build.flash_mode=dio
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio.build.boot=dio
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio.build.boot_freq=80m
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio.build.flash_freq=80m
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio.build.flash_type=qspi
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio.build.flash_type=qio
dfrobot_firebeetle2_esp32s3.menu.FlashMode.opi=OPI 80MHz
dfrobot_firebeetle2_esp32s3.menu.FlashMode.opi.build.flash_mode=dout
dfrobot_firebeetle2_esp32s3.menu.FlashMode.opi.build.boot=opi
Expand Down Expand Up @@ -7712,7 +7712,7 @@ adafruit_feather_esp32s3.build.partitions=default
adafruit_feather_esp32s3.build.defines=
adafruit_feather_esp32s3.build.loop_core=
adafruit_feather_esp32s3.build.event_core=
adafruit_feather_esp32s3.build.flash_type=qspi
adafruit_feather_esp32s3.build.flash_type=qio
adafruit_feather_esp32s3.build.psram_type=qspi
adafruit_feather_esp32s3.build.memory_type={build.flash_type}_{build.psram_type}

Expand All @@ -7721,19 +7721,19 @@ adafruit_feather_esp32s3.menu.FlashMode.qio.build.flash_mode=dio
adafruit_feather_esp32s3.menu.FlashMode.qio.build.boot=qio
adafruit_feather_esp32s3.menu.FlashMode.qio.build.boot_freq=80m
adafruit_feather_esp32s3.menu.FlashMode.qio.build.flash_freq=80m
adafruit_feather_esp32s3.menu.FlashMode.qio.build.flash_type=qspi
adafruit_feather_esp32s3.menu.FlashMode.qio.build.flash_type=qio
adafruit_feather_esp32s3.menu.FlashMode.qio120=QIO 120MHz
adafruit_feather_esp32s3.menu.FlashMode.qio120.build.flash_mode=dio
adafruit_feather_esp32s3.menu.FlashMode.qio120.build.boot=qio
adafruit_feather_esp32s3.menu.FlashMode.qio120.build.boot_freq=120m
adafruit_feather_esp32s3.menu.FlashMode.qio120.build.flash_freq=80m
adafruit_feather_esp32s3.menu.FlashMode.qio120.build.flash_type=qspi
adafruit_feather_esp32s3.menu.FlashMode.qio120.build.flash_type=qio
adafruit_feather_esp32s3.menu.FlashMode.dio=DIO 80MHz
adafruit_feather_esp32s3.menu.FlashMode.dio.build.flash_mode=dio
adafruit_feather_esp32s3.menu.FlashMode.dio.build.boot=dio
adafruit_feather_esp32s3.menu.FlashMode.dio.build.boot_freq=80m
adafruit_feather_esp32s3.menu.FlashMode.dio.build.flash_freq=80m
adafruit_feather_esp32s3.menu.FlashMode.dio.build.flash_type=qspi
adafruit_feather_esp32s3.menu.FlashMode.dio.build.flash_type=qio
adafruit_feather_esp32s3.menu.FlashMode.opi=OPI 80MHz
adafruit_feather_esp32s3.menu.FlashMode.opi.build.flash_mode=dout
adafruit_feather_esp32s3.menu.FlashMode.opi.build.boot=opi
Expand Down