Skip to content

manifest: update sdk-nrf to latest main#798

Open
eivindj-nordic wants to merge 1 commit into
nrfconnect:mainfrom
eivindj-nordic:manifest_update
Open

manifest: update sdk-nrf to latest main#798
eivindj-nordic wants to merge 1 commit into
nrfconnect:mainfrom
eivindj-nordic:manifest_update

Conversation

@eivindj-nordic
Copy link
Copy Markdown
Contributor

@eivindj-nordic eivindj-nordic commented May 19, 2026

Update sdk-nrf to e611a7a75c4380f05716c6f5a984b2e1ff9c589f.

test_sdk_dfu: PR-814

@eivindj-nordic eivindj-nordic self-assigned this May 19, 2026
@eivindj-nordic eivindj-nordic requested a review from a team as a code owner May 19, 2026 11:18
@github-actions github-actions Bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels May 19, 2026
@eivindj-nordic eivindj-nordic added this to the v3.0.0 milestone May 19, 2026
@NordicBuilder
Copy link
Copy Markdown

NordicBuilder commented May 19, 2026

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
nrf nrfconnect/sdk-nrf@v3.3.0 nrfconnect/sdk-nrf@v3.4.0-rc1 nrfconnect/sdk-nrf@v3.3.0..v3.4.0-rc1

All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@github-actions
Copy link
Copy Markdown

You can find the documentation preview for this PR here.

@eivindj-nordic eivindj-nordic requested a review from a team as a code owner May 19, 2026 11:26
@eivindj-nordic eivindj-nordic removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label May 19, 2026
@eivindj-nordic eivindj-nordic requested review from a team and rghaddab as code owners May 19, 2026 11:59
@github-actions github-actions Bot added changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. doc-required PR must not be merged without tech writer approval. labels May 19, 2026
@NordicBuilder NordicBuilder requested a review from a team May 19, 2026 12:22
Copy link
Copy Markdown
Contributor

@nordicjm nordicjm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all fixed-partitions should be changes to mapped partitions as per zephyr 4.4 migration guide

@eivindj-nordic eivindj-nordic force-pushed the manifest_update branch 2 times, most recently from 79a813b to 00422bc Compare May 20, 2026 10:48
Comment thread lib/bluetooth/peer_manager/modules/peer_data_storage.c Outdated
@eivindj-nordic
Copy link
Copy Markdown
Contributor Author

all fixed-partitions should be changes to mapped partitions as per zephyr 4.4 migration guide

Updated DTS and PARTITION macros.

We also need a patch for MCUmgr after the changes in zephyrproject-rtos/zephyr#101821, @nrfconnect/ncs-eris @nordicjm

@eivindj-nordic eivindj-nordic force-pushed the manifest_update branch 2 times, most recently from a74f596 to 8a7080b Compare May 28, 2026 11:19
@eivindj-nordic eivindj-nordic force-pushed the manifest_update branch 4 times, most recently from 77c66d8 to 83a32c8 Compare May 28, 2026 13:32
Update sdk-nrf to v3.4.0-rc1.
Replace CONFIG_NRF_SECUROTY with CONFIG_PSA_CRYPTO.
Updated number of required board qualifiers to 3.
Update to use mapped-partition in DTS.
Workaround for SHELL_STACK_SIZE.

Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no>
sysbuild_get(CONFIG_FLASH_LOAD_SIZE IMAGE ${DEFAULT_IMAGE} VAR CONFIG_FLASH_LOAD_SIZE KCONFIG)
# sysbuild_get(CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION IMAGE ${DEFAULT_IMAGE} VAR CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION KCONFIG)

# Custom TLV 0x0a is set to 0x01 to indicate that this is an installer image
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo: comment says 0x0a but the code uses 0xa0. Should be
# Custom TLV 0xa0 is set to 0x01 to indicate that this is an installer image

@PizzaAllTheWay
Copy link
Copy Markdown
Contributor

This branch fails to link the firmware_loader (uart_mcumgr) image:
undefined reference to mcumgr_serial_tx_pkt.

Reproduce with SB_CONFIG_BM_FIRMWARE_LOADER_UART_MCUMGR=y (what the .uart twister test sets via extra_args).

Root cause: mcumgr_serial_tx_pkt() lives in Zephyr's serial_util.c and is only compiled when MCUMGR_TRANSPORT_SERIAL_HAS_SMP_OVER_CONSOLE is y. In Zephyr's Kconfig.common that symbol sits inside an if MCUMGR scope, so it inherits an implicit depends on MCUMGR. The bare-metal build never sets MCUMGR (it uses NCS_BM_MCUMGR), so the symbol can't turn on and the function is never built — hence the undefined reference.

Suggested fix in subsys/mgmt/mcumgr/transport/Kconfig.bm_uart — add a second definition of the same symbol. Kconfig merges definitions of the same symbol and ORs their dependencies, so this widens the dependency to MCUMGR || NCS_BM_MCUMGR and adds a default that only fires for the UART transport:

+# Re-declare the hidden Zephyr symbol so its deps become MCUMGR || NCS_BM_MCUMGR.
+# Enables it (and compiles mcumgr_serial_tx_pkt() in serial_util.c) for the BM UART transport.
+# Uses default, not select, to avoid the unmet-MCUMGR-dep error.
+config MCUMGR_TRANSPORT_SERIAL_HAS_SMP_OVER_CONSOLE
+	bool
+	default y if MCUMGR_TRANSPORT_BM_UART
+	depends on NCS_BM_MCUMGR
+

 menuconfig MCUMGR_TRANSPORT_BM_UART
	bool "Bare Metal UART MCUmgr SMP transport"
	...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. doc-required PR must not be merged without tech writer approval. manifest manifest-nrf

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants