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

merged 5 commits into from
Jul 18, 2022

Conversation

lbernstone
Copy link
Contributor

Description of Change

bootloader naming was changed in 2.0.4. This matches the S3 boards up with the name change.

Tests scenarios

Untested, but should work. Please look over to make sure I didn't completely overshoot the issue.

Related links

Fixes #6958

@brentru
Copy link

brentru commented Jul 11, 2022

@lbernstone @P-R-O-C-H-Y I tested this on the adafruit_feather_esp32s3 with the same sketch as mentioned in #6958 and did not have compilation errors.

@brentru brentru mentioned this pull request Jul 11, 2022
Merged
@VojtechBartoska VojtechBartoska added Priority: High 🗻 Issues with high priority which needs to be solved first. Status: Test needed Issue needs testing labels Jul 12, 2022
@SuGlider
Copy link
Collaborator

LGTM
I'm not sure why this memory/flash mode is in the file.
I guess that @me-no-dev was working on getting this mode to work and left it there.
We may want to hear from him about it before merging this PR.

@SuGlider
Copy link
Collaborator

Thanks @lbernstone for the quick fix!

@SuGlider
Copy link
Collaborator

SuGlider commented Jul 12, 2022 •
edited
Loading

I'll test just reverting board.txt from 666c66d
It would be more simple to do and keep qspi mode where it should be.

Please hold it...

@SuGlider
Copy link
Collaborator

SuGlider commented Jul 12, 2022 •
edited
Loading

Confirmed that just reverting changes to board.txt from last commit 666c66d has been enough to solve this issue.

I'll change this PR to reflect it. This is the minimum necessary change and it will keep @me-no-dev work at a good state.

@SuGlider
Reverting commit 666c66d of July 6th 2022
9b3ab54 
This will revert changed to `board.txt` from espressif@666c66d
Those changes caused a compiling error to some S3 boards.
@SuGlider
Copy link
Collaborator

OK. Just reverting 666c66d doesn't solve the issue for other boards that are not espressif.
Rolling back to the original PR commit.

@SuGlider
reverting last commit
87699b1 
Last commit didn't solve the issue. The original commit is the right one.
@SuGlider
Copy link
Collaborator

@lbernstone first Commit solves all the issues for good. Thanks!
We shall go with it.

@SuGlider SuGlider self-assigned this Jul 12, 2022
@VojtechBartoska VojtechBartoska added this to the 2.0.5 milestone Jul 13, 2022
@SuGlider SuGlider mentioned this pull request Jul 17, 2022
Closed
1 task
SuGlider
SuGlider approved these changes Jul 18, 2022
View reviewed changes
Copy link
Collaborator

@SuGlider SuGlider left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All fine, Retested it again compiling with:

  • ESP32S3-Dev-Module,
  • ESP32S3-Box,
  • ESP32-S3-USB-OTG
  • ESP32S3-CAM-LCD,
  • UM tinyS3,
  • UM FeatherS3,
  • DFRobot Firebeetle 2 ESP32-S3,
  • Adafruit Feather ESP32-S3 2MB PSRAM,
  • Adafruit Feather ESP32-S3 No PSRAM,
  • Adafruit Feather ESP32-S3 TFT,
  • Adafruit QT Py ESP32-S3 No PSRAM.

All set!

@SuGlider SuGlider merged commit e55a1be into espressif:master Jul 18, 2022
@VojtechBartoska VojtechBartoska added Status: Solved and removed Status: Test needed Issue needs testing labels Jul 19, 2022
@VojtechBartoska
Copy link
Collaborator

Perfect, thank you @SuGlider!

hamishcunningham added a commit to hamishcunningham/arduino-esp32 that referenced this pull request Oct 6, 2022
@hamishcunningham
Fix incorrect flash_type in unphone9 board definition
c8c6c6d 
As per espressif#6962 we have another case of build.flash_type incorrectly named qspi; this commit fixes the issue for the unphone9 board.
@hamishcunningham hamishcunningham mentioned this pull request Oct 6, 2022
Merged
P-R-O-C-H-Y added a commit that referenced this pull request Oct 26, 2022
@hamishcunningham @P-R-O-C-H-Y
Fix incorrect flash_type in unphone9 board definition (#7330)
f00371c 
As per #6962 we have another case of build.flash_type incorrectly named qspi; this commit fixes the issue for the unphone9 board.

Co-authored-by: Jan Procházka <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuGlider SuGlider SuGlider approved these changes

@P-R-O-C-H-Y P-R-O-C-H-Y P-R-O-C-H-Y approved these changes

Assignees

@SuGlider SuGlider

Labels
Priority: High 🗻 Issues with high priority which needs to be solved first. Status: Solved
Projects
Arduino ESP32 Core Project Roadmap
Status: Done
Milestone
2.0.5
Development

Successfully merging this pull request may close these issues.

v2.0.4 - Compilation Error
5 participants
@lbernstone @brentru @SuGlider @VojtechBartoska @P-R-O-C-H-Y