Update Zephyr to v4.0.0 and use main mender-mcu #37
Conversation
This file contains 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
Removes the incompatible pointer types warning Signed-off-by: Daniel Skinstad Drabitzius <[email protected]>
We need to rebuild the workspace image if we e.g. change the revision of any of the projects Signed-off-by: Daniel Skinstad Drabitzius <[email protected]>
danielskinstad
force-pushed
the
zephyr-4
branch
3 times, most recently
from
930af59 to
0a64f46
Compare
danielskinstad
changed the title
danielskinstad
requested review from
lluiscampos and
vpodzime
and removed request for
lluiscampos
* Update the Zephyr revision from `v3.7.0` to `4.0.0` * Change the `mender-mcu` revision from `v0.3-inventory` to `main` * Change `CONFIG_MBEDTLS_ZEPHYR_ENTROPY` to `CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR` and enable `CONFIG_MBEDTLS_ENTROPY_C`. * Set `CONFIG_ZVFS_OPEN_MAX` from 4 to 5 to fix `ENFILE` (23) errors when creating sockets * Increase `CONFIG_NET_SOCKETS_CONNECT_TIMEOUT` to stop zsock_connect() from timing out too early, see: zephyrproject-rtos/zephyr@fc007ee * Disabled `ESP_SPIRAM` in esp32_ethernet_kit config due to linking errors * Update zephyr sdk from 0.16.9 to 0.17.0 Ticket: MEN-7927 Signed-off-by: Daniel Skinstad Drabitzius <[email protected]>
danielskinstad
force-pushed
the
zephyr-4
branch
from
0a64f46 to
e3211ba
Compare
|
Tested on esp32-s3 and nRF52840 |
vpodzime
approved these changes
Jan 21, 2025
lluiscampos
approved these changes
Jan 23, 2025
| @@ -9,11 +9,11 @@ manifest: | |||
| projects: | |||
| - name: zephyr | |||
| remote: zephyrproject-rtos | |||
| revision: v3.7.0 | |||
| revision: v4.0.0 | |||
There was a problem hiding this comment.
Once you are in this area, and you have your setup fresh... could you experiment a bit with name-allowlist in the import to only get the things that we need? 🙈
There was a problem hiding this comment.
Ah - yes. I tried that briefly when I started this, but abandoned it for some reason. But I can do it in a new PR - shouldn't be too hard.
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.
The updated config options are really just based on trial and error on arm. The net socket timeout can probably be set a bit higher, same with the max open file descriptors; what do you think a reasonable value is?