Skip to content

manifest: Upmerge sdk-zephyr repository #27726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlescufi merged 80 commits into from
Apr 30, 2026
Merged

manifest: Upmerge sdk-zephyr repository #27726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
6156060
manifest: Upmerge sdk-zephyr repository
anangl Apr 24, 2026
b67fc5d
cmake: Adapt to changed contents of the BOARD_QUALIFIERS variable
anangl Apr 24, 2026
2b85fca
scripts: tools-versions-linux: try zephyr sdk 1.0.0
nordic-piks Mar 19, 2026
380ef20
scripts: Update pip audit whitelist
anangl Mar 26, 2026
4a12aa5
modules: openthread: platform: Update list of source files
anangl Mar 30, 2026
104bdc7
tests: drivers: i2s: Replace deprecated I2S option macros
anangl Mar 30, 2026
21af6fd
nrf_security: Add nrf_security_utils dependency on zephyr_generated_h…
anangl Mar 31, 2026
9cc171c
cmake: hpf: Add asm_gen dependency on zephyr_generated_headers
anangl Apr 9, 2026
aadaba7
modules: mcuboot: hooks: nrf53: Fix using NULL device
nordicjm Mar 24, 2026
ffe454a
tree: Update repos and partition macro usage
nordicjm Mar 18, 2026
10f3b1e
bootloader_dts_utils: Align address macros
tomchy Mar 19, 2026
1328707
tests: bootloader: b0_ram_cleanup removed retention testing
ahasztag Mar 24, 2026
ef79958
net: openthread: Add missing net_log.h inclusion
anangl Apr 8, 2026
4d534a7
net: lib: downloader: dl_socket: Add missing net_log.h inclusion
anangl Apr 9, 2026
03533a4
lib: lte_link_control: dns: Add missing logging/log.h inclusion
anangl Apr 9, 2026
e9e92d1
treewide: Update paths to NVS and ZMS related files
anangl Apr 8, 2026
47f7ab7
samples: nrf_rpc: protocols_serialization: Add extra snippet root
anangl Apr 2, 2026
88ec61d
applications: hpf: update asm files after zephyr-sdk upgrade
jaz1-nordic Apr 9, 2026
805a96e
tests: drivers: mspi: controller_peripheral: Simplify code flow
anangl Apr 10, 2026
d7d0632
samples: dect_phy: shell: Fix uninitialized variable warning
anangl Apr 10, 2026
1dd84ba
tests: zephyr: drivers: wdt_basic_api: Add Kconfig file
anangl Apr 10, 2026
79226cf
tests: bluetooth: tester: mmdl: Fix uninitialized variable warning
anangl Apr 10, 2026
b383092
bluetooth: fast_pair: Add lib dependencies on zephyr_generated_headers
anangl Apr 10, 2026
5ffa5a5
manifest: Update nrfxlib, matter, and memfault modules
anangl Apr 13, 2026
cfc71b8
samples: cellular: fmfu_smp_svr: Add missing mcumgr dependency
nordic-mare Apr 13, 2026
84bf54d
samples: dect_phy: dect_shell: fix Picolibc duplicate malloc link error
jhirsi Apr 13, 2026
4f0b87c
samples: matter: Fix missing zephyr log include
ArekBalysNordic Apr 13, 2026
21cab81
lib: ram_pwrdn: remove RAM_POWER_ADJUST_ON_HEAP_RESIZE
Damian-Nordic Apr 13, 2026
80b1ae2
scripts: quarantine_zephyr: add scripts.dashboard
nordic-piks Apr 13, 2026
597ba8b
scripts: quarantine_zephyr: extend quarantine for PPR
nordic-piks Apr 13, 2026
d6522bb
scripts: quarantine_zephyr: add display.shield for nrf52832
nordic-piks Apr 14, 2026
db30b1b
boards: nrf54lm20dongle: Enable vregusb for the dongle board
rlubos Apr 14, 2026
5e68a9e
tests: lib: location: Fix unity cmock generation
rlubos Apr 15, 2026
f90e3f6
nrf_security: deprecate PSA_WANT_ECC_SECP_R1_224
tomi-font Apr 14, 2026
8dc47d4
nrf_security: remove CONFIG_PSA_DEFAULT_OFF
tomi-font Apr 15, 2026
828afa2
nrf_security: move Kconfig includes
tomi-font Apr 15, 2026
0610749
samples: tfm_hello_world: fail on failure
tomi-font Apr 15, 2026
01820c5
nrf_security: include Zephyr's Kconfig.tf-psa-crypto
tomi-font Apr 16, 2026
80da9c3
nrf_security: replace MBEDTLS_PSA_CRYPTO_C by PSA_CRYPTO_CLIENT
tomi-font Apr 15, 2026
b490f52
samples: cellular: modem_shell: Disable stack trace with Thingy:91
tokangas Apr 16, 2026
0674725
nrf_security: fix up enabling of CONFIG_MBEDTLS_USE_PSA_CRYPTO
tomi-font Apr 16, 2026
bf32643
tests: mspi: controller_peripheral: Fix compliance check failure
anangl Apr 16, 2026
cd70ebe
treewide: rename CONFIG_MBEDTLS_CFG_FILE
tomi-font Apr 20, 2026
05be8d7
samples: crypto: hkdf: remove enabling of CONFIG_MBEDTLS_PK_PARSE_C
tomi-font Apr 20, 2026
a7cd4a5
Revert "tests: tfm: Temporarily disable UART HWFC for nRF9160"
tomi-font Apr 17, 2026
6085d7e
tests: tf-m: regression: move files
tomi-font Apr 17, 2026
eecd20b
tests: tf-m: regression: refactor and align with Zephyr
tomi-font Apr 20, 2026
ed266e2
modules: tf-m: adjust Kconfig files
tomi-font Apr 22, 2026
4599224
scripts: quarantine_zephyr: update test names
tomi-font Apr 22, 2026
a6b1486
tests: tf-m: regression: disable Attestation tests on 53/91
tomi-font Apr 22, 2026
f7c3fdf
tests: tf-m: regression: increase TF-M flash partition on 53/91
tomi-font Apr 22, 2026
9d67af4
manifest: sdk-hostap: Use sdk-hostap instead of upstream hostap
rado17 Apr 22, 2026
105e95a
drivers: sdhc_semmc: Update after sdhc_host_props structure refactoring
anangl Apr 22, 2026
358d998
tools: Update zephyr-sdk to 1.0.1
jangalda-nsc Apr 17, 2026
be2c7f7
tools: Bump lxml, svada and python-dotenv
jangalda-nsc Apr 22, 2026
a9d9bef
nrf_security: avoid redefinition of MBEDTLS_PSA_STATIC_KEY_SLOTS
tomi-font Apr 23, 2026
c9f461e
scripts: quarantine_zephyr: add crypto.secp256r1.*
tomi-font Apr 23, 2026
3f9066f
tests: tfm: tfm_psa_test: disable problematic Kconfig options
tomi-font Apr 24, 2026
f0a93ad
tests: zephyr: drivers: uart: uart_mix_fifo_poll: Use timer based RNG
nordic-krch Apr 24, 2026
1b1297f
scripts: quarantine: add sample.bluetooth.mesh_dfu
nordic-piks Apr 27, 2026
e7af71c
img_mgmt: Align with the mapped partitions
tomchy Apr 24, 2026
1cbbce7
img_mgmt: Align merged slot mapped partitions
tomchy Apr 27, 2026
0212837
samples: dfu: Enable UART_MCUMGR
tomchy Apr 27, 2026
7a0dbf5
applications: nrf5340_audio: Upmerge fixes
alexsven Apr 27, 2026
bb3fa19
applications: hpf: update nRF7120 GPIO asm for zephyr-sdk 1.0
erdemsimsek Apr 27, 2026
ce55e3c
applications: hpf: update nRF54LV10A asm for zephyr-sdk 1.0.1
jaz1-nordic Apr 28, 2026
098e97c
scripts: quarantine_zephyr: add libraries.heap.hardening_full
nordic-piks Apr 28, 2026
8a9636f
scripts: quarantine_zephyr: extend for bluetooth.shell.shell_br
nordic-piks Apr 28, 2026
1494fd3
doc: memfault_ncs: Remove reference to CONFIG_MEMFAULT_NRF_SHELL
anangl Apr 28, 2026
f7c1a87
nrf_security: define CONFIG_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE
tomi-font Apr 28, 2026
9a1fb54
img_mgmt: Use custom logic for merged slot
tomchy Apr 28, 2026
eb3da2c
samples: dfu: single_slot: Fix mcuboot on ls05b
adsz-nordic Apr 28, 2026
2c3fa3d
samples: bluetooth: add missing zephyr,mapped-partition
Damian-Nordic Apr 28, 2026
0243386
doc: zephyr: add missing driver_ops Doxygen aliases
gmarull Apr 29, 2026
8f3063f
scripts: quarantine_zephyr: add wifi.build
nordic-piks Apr 29, 2026
5f40fb6
scripts: quarantine: add applications.nrf_desktop.zrelease for ls05
nordic-piks Apr 29, 2026
6bf19b8
doc: replace broken intersphinx refs to old Zephyr release notes
gmarull Apr 29, 2026
6b524b2
scripts: quarantine: add sample.bluetooth.peripheral* at h20
nordic-piks Apr 29, 2026
fca4f8c
tests: ref_smp_svr: Fix test on nrf54ls05b
adsz-nordic Apr 29, 2026
d10ccef
samples: esb: use central appcore sysbuild integration
maje-emb Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/oss-history.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ jobs:
uses: nrfconnect/action-oss-history@main
with:
workspace: 'ncs'
args: -p zephyr -p hostap -p wfa-qt-control-app
args: -p zephyr -p wfa-qt-control-app
1 change: 1 addition & 0 deletions CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,6 +1023,7 @@
/tests/zephyr/drivers/uart/ @nrfconnect/ncs-low-level-test
/tests/zephyr/drivers/watchdog/ @nrfconnect/ncs-low-level-test
/tests/zephyr/kernel/timer/timer_behavior/ @nrfconnect/ncs-low-level-test
/tests/zephyr/modules/tf-m/regression/ @nrfconnect/ncs-aegir
/tests/zephyr/subsys/sd/ @nrfconnect/ncs-low-level-test
/tests/zephyr/subsys/secure_storage/ @nrfconnect/ncs-aegir
/tests/zephyr/subsys/settings/performance/ @nrfconnect/ncs-eris @rghaddab
Expand Down
4 changes: 0 additions & 4 deletions Kconfig.nrf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ orsource "./cmake/toolchain/$(ZEPHYR_TOOLCHAIN_VARIANT)/Kconfig.defconfig"
rsource "subsys/net/openthread/Kconfig.defconfig"
rsource "subsys/net/lib/hostap_crypto/Kconfig.defconfig"

if !TFM_PROFILE_TYPE_MINIMAL
rsource "modules/trusted-firmware-m/Kconfig.mbedtls.defconfig"
endif # ! TFM_PROFILE_TYPE_MINIMAL

if TFM_PROFILE_TYPE_MINIMAL
rsource "modules/trusted-firmware-m/Kconfig.mbedtls_minimal.defconfig"
rsource "modules/trusted-firmware-m/Kconfig.tfm_minimal.defconfig"
Expand Down
3 changes: 2 additions & 1 deletion applications/hpf/gpio/src/hrt/hrt-nrf54l15.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.file "hrt.c"
.option nopic
.attribute arch, "rv32e1p9_m2p0_c2p0_zicsr2p0"
.attribute arch, "rv32e2p0_m2p0_c2p0_zicsr2p0"
.attribute unaligned_access, 0
.attribute stack_align, 4
.text
Expand Down Expand Up @@ -77,3 +77,4 @@ hrt_set_masked_bits:
#NO_APP
ret
.size hrt_set_masked_bits, .-hrt_set_masked_bits
.section .note.GNU-stack,"",@progbits
3 changes: 2 additions & 1 deletion applications/hpf/gpio/src/hrt/hrt-nrf54lm20a.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.file "hrt.c"
.option nopic
.attribute arch, "rv32e1p9_m2p0_c2p0_zicsr2p0"
.attribute arch, "rv32e2p0_m2p0_c2p0_zicsr2p0"
.attribute unaligned_access, 0
.attribute stack_align, 4
.text
Expand Down Expand Up @@ -77,3 +77,4 @@ hrt_set_masked_bits:
#NO_APP
ret
.size hrt_set_masked_bits, .-hrt_set_masked_bits
.section .note.GNU-stack,"",@progbits
3 changes: 2 additions & 1 deletion applications/hpf/gpio/src/hrt/hrt-nrf54lm20b.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.file "hrt.c"
.option nopic
.attribute arch, "rv32e1p9_m2p0_c2p0_zicsr2p0"
.attribute arch, "rv32e2p0_m2p0_c2p0_zicsr2p0"
.attribute unaligned_access, 0
.attribute stack_align, 4
.text
Expand Down Expand Up @@ -77,3 +77,4 @@ hrt_set_masked_bits:
#NO_APP
ret
.size hrt_set_masked_bits, .-hrt_set_masked_bits
.section .note.GNU-stack,"",@progbits
3 changes: 2 additions & 1 deletion applications/hpf/gpio/src/hrt/hrt-nrf54lv10a.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.file "hrt.c"
.option nopic
.attribute arch, "rv32e1p9_m2p0_c2p0_zicsr2p0"
.attribute arch, "rv32e2p0_m2p0_c2p0_zicsr2p0"
.attribute unaligned_access, 0
.attribute stack_align, 4
.text
Expand Down Expand Up @@ -77,3 +77,4 @@ hrt_set_masked_bits:
#NO_APP
ret
.size hrt_set_masked_bits, .-hrt_set_masked_bits
.section .note.GNU-stack,"",@progbits
3 changes: 2 additions & 1 deletion applications/hpf/gpio/src/hrt/hrt-nrf7120.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.file "hrt.c"
.option nopic
.attribute arch, "rv32e1p9_m2p0_c2p0_zicsr2p0"
.attribute arch, "rv32e2p0_m2p0_c2p0_zicsr2p0"
.attribute unaligned_access, 0
.attribute stack_align, 4
.text
Expand Down Expand Up @@ -77,3 +77,4 @@ hrt_set_masked_bits:
#NO_APP
ret
.size hrt_set_masked_bits, .-hrt_set_masked_bits
.section .note.GNU-stack,"",@progbits
Loading
Loading