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

ESP32-S2: Fix creation of .rwdata_dummy section #3096

Merged
merged 2 commits into from
Feb 5, 2025

Conversation

bjoernQ
Copy link
Contributor

@bjoernQ bjoernQ commented Feb 5, 2025

Thank you for your contribution!

We appreciate the time and effort you've put into this pull request.
To help us review it efficiently, please ensure you've gone through the following checklist:

Submission Checklist 📝

  • I have updated existing examples or added new ones (if applicable).
  • I have used cargo xtask fmt-packages command to ensure that all changed code is formatted correctly.
  • My changes were added to the CHANGELOG.md in the proper section.
  • I have added necessary changes to user code to the Migration Guide.
  • My changes are in accordance to the esp-rs API guidelines

Extra:

Pull Request Details 📖

Description

Previously the .rwdata_dummy section was setting the location counter based on ORIGIN(RWDATA) which is defined as dram_seg ( RW ) : ORIGIN = 0x3FFB0000 + RESERVE_CACHES + VECTORS_SIZE, len = 188k - RESERVE_CACHES - VECTORS_SIZE

Instead of using origin we can use the current location counter and add SIZEOF(.rwtext) + SIZEOF(.rwtext.wifi) to fix it

Testing

CI and running e.g. wifi_embassy_dhcp or psram examples

Copy link
Member

@jessebraham jessebraham left a comment

Choose a reason for hiding this comment

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

Thanks!

@bugadani bugadani enabled auto-merge February 5, 2025 08:59
@bugadani bugadani added this pull request to the merge queue Feb 5, 2025
Merged via the queue into esp-rs:main with commit f46f862 Feb 5, 2025
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants