manifest: Upmerge sdk-zephyr and sdk-mcuboot repositories#23979
Merged
Conversation
github-actions
Bot
added
manifest
changelog-entry-required
Contributor
|
The following west manifest projects have changed revision in this Pull Request:
Additional metadata changed:
⛔ DNM label due to: 2 projects with metadata changes Note: This message is automatically posted and updated by the Manifest GitHub Action. |
Contributor
CI InformationTo view the history of this post, clich the 'edited' button above Inputs:Sources:trusted-firmware-m: PR head: 3e12b0cc27d828d7ec04c4ac62ad45a9a905573e more detailstrusted-firmware-m:
sdk-nrf:
mcuboot:
mbedtls:
openthread:
hostap:
zephyr:
Github labels
List of changed files detected by CI (14431)Outputs:ToolchainVersion: 2b2cd9579a Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped;
|
jukkar
force-pushed
the
upmerge-08-08-2025
branch
2 times, most recently
from
778749a to
c64a304
Compare
jukkar
force-pushed
the
upmerge-08-08-2025
branch
2 times, most recently
from
67762e2 to
aefaddb
Compare
jukkar
force-pushed
the
upmerge-08-08-2025
branch
from
aefaddb to
53408f0
Compare
jukkar
force-pushed
the
upmerge-08-08-2025
branch
2 times, most recently
from
3d377e5 to
39ff801
Compare
tejlmand
approved these changes
Sep 10, 2025
SeppoTakalo
approved these changes
Sep 10, 2025
jtguggedal
approved these changes
Sep 10, 2025
TinyCrypt library is no longer supported by Zephyr. Jira: NCSDK-35445 Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
TinyCrypt library is no longer supported by Zephyr. Jira: NCSDK-35445 Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Remove override for (now promptless) Kconfig. Remove the override to ROM_START_OFFSET, which is already changed if the partition manager is enabled. Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
The sample in Kconfig sets default ZMS to 'y', but ZMS also must select CRC. It is done in different place, but because how Kconfig works it must be also set here. Jira: NCSDK-35447 Jira: NCSDK-35446 Signed-off-by: Dominik Kilian <dominik.kilian@nordicsemi.no>
Add this missing dependency which is used in the Zephyr doc build. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
L2 variant is not needed in coprocessor sample. We can use there only the raw nrf-radio version. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
On LLVM toolchain, the lack of cast produces an error of incompatible pointer types. Ref. NCSDK-35444 Signed-off-by: Michał Grochala <michal.grochala@nordicsemi.no>
PERIPHCONF generation based on devicetree is being added in a script in upstream zephyr. The new script script replaces nrf-regtool and the temporary "periphconf migration" solution. Ref: NCSDK-35206 Signed-off-by: Jonathan Nilsen <jonathan.nilsen@nordicsemi.no>
Temporarily remove Thingy53 support as it doesn't build after the USB stack change in Zephyr. TODO: migrate to the new USB stack. Signed-off-by: Michał Grochala <michal.grochala@nordicsemi.no>
The BT_RPC uses dynamic callbacks for serialization and it always requres it. This commit contains Kconfig changes that enables BT_CONN_DYNAMIC_CALLBACKS always when BT_RPC is enabled. Jira: NCSDK-35443 Signed-off-by: Dominik Kilian <dominik.kilian@nordicsemi.no>
Some test configurations report FLASH overflow. This change adds these for qurantine. Signed-off-by: Katarzyna Giądła <katarzyna.giadla@nordicsemi.no>
The separate main_mode_type and sub_mode_type fields in the CS configuration have been replaced by a single mode field. Updates the logging in the config_create_cb callback to reflect this change. This aligns the sample with the updated API. Signed-off-by: Aleksandr Mirlenko <aleksandr.mirlenko@nordicsemi.no>
Required by upstream Zephyr. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
The board overlay in bootloader/mcuboot for the nrf54h20dk/nrf54h20/cpuapp platform is required, but ignored as FILE_SUFFIX="requests" matches the mcuboot_requests.overlay in this sample instead. Copy the missing contents of the board overlay from bootloader/mcuboot to mcuboot_requests.overlay Signed-off-by: Artur Hadasz <artur.hadasz@nordicsemi.no>
Some test configurations report FLASH overflow. This change adds these for qurantine. Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Aling properly to the rest. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
See 12c4d7661ade1fb0a6be3af705da63ffcbd37851 upstream. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
divipillai
approved these changes
Sep 23, 2025
umapraseeda
reviewed
Sep 23, 2025
See upstream commit 6de770291092178058bf3652a5221d32b4e8e078. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
See upstream commit 047c9f58d8e5026c57bf50c54978501b53caa9d6. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
Remove remaining refenrences to an obsolete board. Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
peknis
approved these changes
Sep 23, 2025
nordic-segl
approved these changes
Sep 23, 2025
nordicjm
reviewed
Sep 23, 2025
Comment on lines
+96
to
+98
| * The nRF5 MBR partition (``nrf5_mbr``) added by the ``nrf52840dongle/nrf52840`` board is not used. | ||
| It is statically defined with address and size both set to zero to prevent Partition Manager from trying to place it dynamically. | ||
| The application did not switch to the ``bare`` board variant to keep backwards compatibility. |
Contributor
There was a problem hiding this comment.
@MarekPieta no, this needs to switch to the bare variant, the non bare variant is with nRF5 bootloader
Contributor
There was a problem hiding this comment.
This was added to fix the issue during the upmerge. I am discussing the way of moving forward with @pdunaj. If necessary, we will revert the commit and switch to the bare variant after the upmerge is done.
Contributor
There was a problem hiding this comment.
I fully agree that bare variant is better for new applications. In case of nRF Desktop, we need to take into account backwards compatibility and consistency with nRF52820dongle and nRF52833dongle (app-specific boards).
Contributor
There was a problem hiding this comment.
Needs to be done as a follow-up PR @nordicjm and @MarekPieta
nordicjm
reviewed
Sep 23, 2025
| Enable functionality required for internal purposes e.g. testing. | ||
|
|
||
| config BT_CONN_DYNAMIC_CALLBACKS | ||
| bool |
Contributor
There was a problem hiding this comment.
Suggested change
| bool |
do not redeclare variables @doki-nordic
Contributor
There was a problem hiding this comment.
in fact the whole thing can go, it already defaults to y: https://github.com/jukkar/sdk-zephyr/blob/meta-upmerge/subsys/bluetooth/Kconfig#L141
Contributor
There was a problem hiding this comment.
Needs to be done as a follow-up PR @nordicjm and @doki-nordic
Update sdk-zephyr, sdk-mbedtls and sdk-mcuboot SHAs, switching to the new rebased histories. Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Contributor
Memory footprint analysis revealed the following potential issuesapplications.nrf_desktop.zdebug[nrf52dmouse/nrf52832]: ROM size increased by 732[B] in comparison to the main[ef7a690] branch. - link (cc: @nrfconnect/ncs-si-bluebagel) Note: This message is automatically posted and updated by the CI (latest/sdk-nrf/PR-23979/34) |
rlubos
approved these changes
Sep 23, 2025
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
20 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.
Regular upmerge.
test_rs: PR-1744
test_fem: PR-1744
test-sdk-nrf: sdk-nrf-pr-23979
test_secdom_samples_public: NCSDK-NONE_fix_uicr_path
test_sdk_mcuboot: pr-23979
test_sdk_dfu: upmerge_08_08_2025
test_crypto: PR-851
test_tfm: PR-204
test_proprietary: PR-113
test_thread: PR-1431