ports/esp32: Allow overriding linker.lf. #16658
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
karlp
added a commit
to karlp/micropython-example-boards
that referenced
this pull request
Jan 27, 2025
This requires handling the following upstream commits: decf8e6a8b all: Remove the "STATIC" macro and just use "static" instead. 27279e69b4 esp32: Add IDF-version-specific sdkconfig. and, importantly acbdbcd95e esp32: Workaround IDF issue placing ISR ringbuf functions in IRAM Replacing STATIC was easy. Adding the IDF version specific was just implemented as upstream. However, the new linker.lf files are not in a path that is being searched properly. I believe this can only be fixed in micropython itself by providing a better file reference. The suggested upstream fix is available here: micropython/micropython#16658 and is _required_ for this patch. Signed-off-by: Karl Palsson <karl.palsson@marel.com>
Particularly for out of tree builds, one may need to provide alternative or extra linker fragment files, or specify an absolute path to the default `linker.lf` file. In the default case, do nothing, provide a plain `linker.lf`, as before. Signed-off-by: Karl Palsson <karl.palsson@marel.com>
c7d310e to
cbd21b3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Particularly for out of tree builds, we may need to provide alternative/extra linker fragment files.
In the default case, do nothing, provide a plain linker.lf, as before.
Summary
Updated version of:
#16013
Now handled in the shared cmake file. The external/examples/out-of-tree builds can now choose at their leisure whether to include a local copy of the linker.lf files, provide a custom one, or refer to the existing in-tree one.
Testing
Build testing for esp32 and esp32-s3 and comparing the sections.ld output, and verifying which files are searched for, by setting / un setting / setting invalid paths for the MICROPY_USER_LDFRAGMENTS