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.

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

update adafruit boards tinyuf2 and partition scheme #6770

Merged
merged 2 commits into from
May 30, 2022

Conversation

hathach
Copy link
Contributor

@hathach hathach commented May 18, 2022

Description of Change

  • Follow up to Added new "Non TinyUF2 bootloader only" capability for boards that support TinyUF2 bootloaders #6668, this PR update partition scheme for Adafruit Boards. It address one of the walk-around @UnexpectedMaker need to do is renaming the tinyuf2.bin/bootloader.bin in the variant folder.
  • Also take this chance to update tinyuf2 for Adafruit from 0.6.0 to 0.9.2 version
  • Fix ssue with atmegazero_esp32s2 board (also use tinyuf2), which has 16MB flash on board but incorrectly use 4MB partition.csv. Not sure if I am overstepping here, if yes, I could revert changes to this board.

Tests scenarios

  • Arduino IDE 1.8.19 on Ubuntu 22.04
  • arduino-esp32 core at v2.0.4 commmit ed33e15
  • Adafruit Boards: Feather S2, Feather S2 TFT, Metro S2, Funhouse, Magtag, qtpy S2, S3 devkitC (as prototyping for Adafruti Feather S3).

Related links

@ladyada

platform.txt Outdated
build.custom_bootloader=bootloader
build.custom_partitions=partitions
build.custom_bootloader=
build.custom_partitions=
Copy link
Contributor

Choose a reason for hiding this comment

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

This makes the build search for variant/.bin, expanded from "{build.variant.path}"/{build.custom_bootloader}.bin. Maybe it should be left as is?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah, this is meant to expanded to non-existed files by default in the variant/board folder so that one of the espressif default parition csv can be used if an TinyUF2 scheme isn't selected.

Copy link
Member

Choose a reason for hiding this comment

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

it will still expand to non-existing if you name yours to something else. Default values are there to allow variants to add bootloader.bin and partitions.csv and be done, without having to specify anything in boards.txt. Please rename your bootloaders to something else and the defaults here will work as expected :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

update PR to revert this changes and rename the bootloader/partition in the variant folder as suggested.

@Ouss4 Ouss4 added the hil_test Run Hardware Tests label May 18, 2022
@github-actions
Copy link
Contributor

github-actions bot commented May 18, 2022

Unit Test Results

  8 files    8 suites   1m 23s ⏱️
  4 tests   4 ✔️ 0 💤 0
16 runs  16 ✔️ 0 💤 0

Results for commit 32fc416.

♻️ This comment has been updated with latest results.

- add tinyuf2 suffix to variant bootloader, cvs
- also update adafruit esp32s3 menu to match latest esp32s3dev one
@hathach hathach requested a review from me-no-dev May 30, 2022 10:18
@me-no-dev me-no-dev merged commit f3e4162 into espressif:master May 30, 2022
@me-no-dev
Copy link
Member

Thanks @hathach

@hathach
Copy link
Contributor Author

hathach commented May 30, 2022

Thanks @hathach

I am the one to say thanks :)

@hathach hathach deleted the update-adafruit-boards branch July 19, 2022 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hil_test Run Hardware Tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants