Update to micropython 1.23 - #3
Closed
karlp wants to merge 1 commit into
Closed
Conversation
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, and will provide a fix
there.
Required patch:
$ git diff
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index e928fb439..8ba868c20 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -153,7 +153,7 @@ idf_component_register(
${MICROPY_BOARD_DIR}
${CMAKE_BINARY_DIR}
LDFRAGMENTS
- linker.lf
+ ${MICROPY_PORT_DIR}/main_${IDF_TARGET}/linker.lf
REQUIRES
${IDF_COMPONENTS}
)
Tested with esp32 builds, and esp32-s3 builds and runtime tests.
Signed-off-by: Karl Palsson <karlp@tweak.au>
Member
|
Thanks for the contribution! We will should wait until the patch to MicroPython is merged, so that the examples here build with the latest version. |
Member
|
As suggested in micropython/micropython#16013 I suggest we copy |
Contributor
Author
absolutely, wouldn't dream of it otherwise, but had to post it like this to have them connected, and show the whole picture |
Member
|
Closing in favour of #4. |
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
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.
This requires handling the following upstream commits:
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, and will provide a fix there. (Filed, see micropython/micropython#16013
I believe this also fixes #2
Required patch:
Tested with esp32 builds, and esp32-s3 builds and runtime tests.
Signed-off-by: Karl Palsson karlp@tweak.au