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

Roll esp-idf to 5.1. #2650

Merged
merged 6 commits into from
Nov 29, 2024
Merged

Roll esp-idf to 5.1. #2650

merged 6 commits into from
Nov 29, 2024

Conversation

floitsch
Copy link
Member

No description provided.

@cla-bot cla-bot bot added the cla-signed The contributors have signed the CLA label Nov 27, 2024
@floitsch
Copy link
Member Author

Currently points to 5.1-dev. I will update this PR once 5.1-dev has been merged into 5.1.

Copy link
Member

@kasperl kasperl left a comment

Choose a reason for hiding this comment

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

Looks good to me.

Copy link
Member

@kasperl kasperl left a comment

Choose a reason for hiding this comment

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

Looks good to me.

# Toit configuration for mbedtls

This directory contains the configuration for building mbedtls with Toit.
When compiling for the ESP32 family, the ESP-IDF configuration is used.
Copy link
Member

Choose a reason for hiding this comment

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

So these two files are ignored on esp-idf? Maybe clarify. Also where is the esp-idf configuration stored?

Copy link
Member Author

Choose a reason for hiding this comment

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

done.


When updating mbedtls to a new version, the configuration files should be
updated to match the new version. Replace the `default_config.h` with the
new version and update the `toit_config.h` to match the changes.
Copy link
Member

Choose a reason for hiding this comment

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

Where do you get the new default version from? I guess it is a copy of mbedtls_config.h? Why do we need to have an unused copy? I'm not sure I follow the "serves as a reference for the configuration options" part.

Is it because the mbedtls_config.h file lives in another repository?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's just to have the "old" config file as reference to make diffs and see what we changed.
I clarified the text and added a Makefile check to ensure we don't forget to update it when we roll a new esp-idf.
done.

Copy link
Member

@kasperl kasperl left a comment

Choose a reason for hiding this comment

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

Even better!

@floitsch floitsch merged commit 9bc1f09 into master Nov 29, 2024
28 checks passed
@floitsch floitsch deleted the floitsch/update-idf branch November 29, 2024 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The contributors have signed the CLA
Development

Successfully merging this pull request may close these issues.

2 participants