Upmerge 2024.12.20 #19720
Merged
Upmerge 2024.12.20 #19720
+1,891
−5,143
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
Contributor
|
The following west manifest projects have changed revision in this Pull Request: ✅ All manifest checks OK Note: This message is automatically posted and updated by the Manifest GitHub Action. |
anangl
force-pushed
the
upmerge_20241220
branch
from
18c283b to
b8faff3
Compare
Member
|
#19200 should be merged first (other repos need the same update, will open PRs) |
Member
|
3efae06 should be added here (I assume upstream BICR tooling is part of this upmerge) |
anangl
force-pushed
the
upmerge_20241220
branch
from
b8faff3 to
2cd1bec
Compare
github-actions
bot
added
the
doc-required
anangl
force-pushed
the
upmerge_20241220
branch
2 times, most recently
from
e829967 to
00df919
Compare
Contributor
Author
done |
anangl
force-pushed
the
upmerge_20241220
branch
3 times, most recently
from
f315d52 to
22726df
Compare
anangl
force-pushed
the
upmerge_20241220
branch
from
22726df to
1b276e2
Compare
anangl
requested review from
a team,
krish2718 and
sachinthegreen
as code owners
The NRF_RNG_ENTROPY_DRIVER provides entropy though the PSA APIs. This is used to seed/reseed the Oberon PSA random drivers (CTR_DRBG/HMAC_DRBG). Before this was only used to allow enabling this PSA driver with the devices which use the DT label 'rng'. We extend that now to allow this driver to be used with the fake entropy node which uses the DT label 'prng'. This is needed to unblock development until real RNG is enabled for all the needed applications/samples. In practice this means that when 'prng' is enabled a device can generate random numbers with the psa_generate_random call. Signed-off-by: Georgios Vasilakis <[email protected]> Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-Adding CONFIG_MBEDTLS_FORCE_LEGACY_MD for cc3xx/oberon legacy psa_tls to avoid that MBEDTLS_MD_SOME_PSA is getting set Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-Fixes issues with nRF54H20 and nRF5340dk in upmerge. This can be seen as a workaround -Adjusting board-files for central_uart and peripheral_uart for nRF5340 and nRFH20 cpuapp Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-HKDF reports errors when MBEDTLS_MD_SOME_PSA is set. Setting this configuration to avoid trying to resolve with PSA APIs. This configurations and these tests to be removed with more standardization on PSA crypto Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Increased stack sizes to prevent the stack overflows. Jira: NCSDK-31374 Signed-off-by: Mateusz Kapala <[email protected]>
-Adjusting CONFIG_HEAP_MEM_POOL_SIZE down from 2048 to 1536 to try to get the smallest devices to build Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-Setting main stack size to 3584 for nRF54LX series that enable rng to avoid stack overflow Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-This commit removes CONFIG_MAIN_STACK_SIZE in BLE Samples. The adjustments were initially made to give more stack than upstream, but due to the change to PSA crypto it ends up being something that limits higher stack sizes (e.g. on CRACEN devices) Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-Note that nRF52810 devices is removed to avoid failures in twister -This removes default-set stack sizes to get more BLE samples to work in the latest upmerge Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-Note that this removed nRF52805, nrf52810 and nrf52811 from build in the peripheral_uart_minimal. This may be reverted if there is a movement of more items to the BT_LONG_WORKQUEUE instead of using system workqueueue -Removing overrides to stack-sizes for peripheral_uart sample regular and minimal configuration Signed-off-by: Frank Audun Kvamtrø <[email protected]>
As in the topic Signed-off-by: Maciej Perkowski <[email protected]> Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-Ended up with defaults likely to low Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-Removing nRF54L05 because it is overflowing on RAM size (~500 bytes). This commit can be reverted when/if the sample is optimized a bit for RAM size. Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-There was no pattern to increase stack-size for nRF54H20 devices likely leading to a few issues of stack overflow. Thiscommit adds a pattern to set the stack-sizes a bit up for nRF54H20 CPUAPP and CPURAD Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Signing of the image fails due to exceeded size. This issue couldn't be solved within the upmerge and needs to be addressed afterwards. Signed-off-by: Andrzej Głąbek <[email protected]>
Signing of the image fails due to exceeded size. This issue couldn't be solved within the upmerge and needs to be addressed afterwards. Signed-off-by: Andrzej Głąbek <[email protected]>
anangl
force-pushed
the
upmerge_20241220
branch
from
eae42a3 to
9f410d5
Compare
trantanen
added a commit
to trantanen/sdk-nrf
that referenced
this pull request
Apr 1, 2025
Use of CONFIG_UART_x_NRF_HW_ASYNC has been mostly removed earlier from SLM app side with PR nrfconnect#19720. Removing last few references. This causes some overlays to become empty so they are deleted. overlay-zephyr-modem-external-mcu.conf would only have CONFIG_SLM_POWER_PIN so it's also removed and documentation updated so that apps should define it. Signed-off-by: Tommi Rantanen <[email protected]>
trantanen
added a commit
to trantanen/sdk-nrf
that referenced
this pull request
Apr 1, 2025
Use of CONFIG_UART_x_NRF_HW_ASYNC has been removed earlier from SLM app side with PR nrfconnect#19720. Signed-off-by: Tommi Rantanen <[email protected]>
nordicjm
pushed a commit
that referenced
this pull request
Apr 1, 2025
Use of CONFIG_UART_x_NRF_HW_ASYNC has been mostly removed earlier from SLM app side with PR #19720. Removing last few references. This causes some overlays to become empty so they are deleted. overlay-zephyr-modem-external-mcu.conf would only have CONFIG_SLM_POWER_PIN so it's also removed and documentation updated so that apps should define it. Signed-off-by: Tommi Rantanen <[email protected]>
nordicjm
pushed a commit
that referenced
this pull request
Apr 1, 2025
Use of CONFIG_UART_x_NRF_HW_ASYNC has been removed earlier from SLM app side with PR #19720. Signed-off-by: Tommi Rantanen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
41 participants
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.
Pull in upmerged revisions of zephyr and mcuboot.
test_low_level: PR-1765
test_rs: PR-1483
test_fem: PR-1483
test_ble_mesh: ble_mesh_upmerge_test
test_crypto: PR-750
test_suit_dfu: PR-450
test_tfm: PR-194
test_secdom_samples_public: NCSDK-NONE_upmerge_jan2025
test_audio: PR-294
test_wifi: sdk-nrf-pr-19720
test_nrf: sdk-nrf-pr-19720
test_proprietary: PR-93