diff --git a/.github/workflows/oss-history.yml b/.github/workflows/oss-history.yml index bfa40ab60192..e602d8074534 100644 --- a/.github/workflows/oss-history.yml +++ b/.github/workflows/oss-history.yml @@ -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 diff --git a/CODEOWNERS b/CODEOWNERS index e6a4eec81b34..303497560b23 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -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 diff --git a/Kconfig.nrf b/Kconfig.nrf index d7392f6a9d93..4c82c5625c9b 100644 --- a/Kconfig.nrf +++ b/Kconfig.nrf @@ -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" diff --git a/applications/hpf/gpio/src/hrt/hrt-nrf54l15.s b/applications/hpf/gpio/src/hrt/hrt-nrf54l15.s index 3a3d6a29e79f..e88619c864fb 100644 --- a/applications/hpf/gpio/src/hrt/hrt-nrf54l15.s +++ b/applications/hpf/gpio/src/hrt/hrt-nrf54l15.s @@ -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 @@ -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 diff --git a/applications/hpf/gpio/src/hrt/hrt-nrf54lm20a.s b/applications/hpf/gpio/src/hrt/hrt-nrf54lm20a.s index 3a3d6a29e79f..e88619c864fb 100644 --- a/applications/hpf/gpio/src/hrt/hrt-nrf54lm20a.s +++ b/applications/hpf/gpio/src/hrt/hrt-nrf54lm20a.s @@ -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 @@ -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 diff --git a/applications/hpf/gpio/src/hrt/hrt-nrf54lm20b.s b/applications/hpf/gpio/src/hrt/hrt-nrf54lm20b.s index 3a3d6a29e79f..e88619c864fb 100644 --- a/applications/hpf/gpio/src/hrt/hrt-nrf54lm20b.s +++ b/applications/hpf/gpio/src/hrt/hrt-nrf54lm20b.s @@ -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 @@ -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 diff --git a/applications/hpf/gpio/src/hrt/hrt-nrf54lv10a.s b/applications/hpf/gpio/src/hrt/hrt-nrf54lv10a.s index 3a3d6a29e79f..e88619c864fb 100644 --- a/applications/hpf/gpio/src/hrt/hrt-nrf54lv10a.s +++ b/applications/hpf/gpio/src/hrt/hrt-nrf54lv10a.s @@ -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 @@ -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 diff --git a/applications/hpf/gpio/src/hrt/hrt-nrf7120.s b/applications/hpf/gpio/src/hrt/hrt-nrf7120.s index 3a3d6a29e79f..e88619c864fb 100644 --- a/applications/hpf/gpio/src/hrt/hrt-nrf7120.s +++ b/applications/hpf/gpio/src/hrt/hrt-nrf7120.s @@ -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 @@ -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 diff --git a/applications/hpf/mspi/src/hrt/hrt-nrf54l15.s b/applications/hpf/mspi/src/hrt/hrt-nrf54l15.s index 17133b339102..1784f052d37a 100644 --- a/applications/hpf/mspi/src/hrt/hrt-nrf54l15.s +++ b/applications/hpf/mspi/src/hrt/hrt-nrf54l15.s @@ -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 @@ -9,32 +9,33 @@ .type hrt_tx, @function hrt_tx: lw a5,4(a0) - addi sp,sp,-16 - sw s0,12(sp) - sw s1,8(sp) - sw a2,0(sp) + addi sp,sp,-20 + sw s0,16(sp) + sw s1,12(sp) + sw a2,4(sp) beq a5,zero,.L1 li a4,32 div a4,a4,a1 - lui t2,%hi(xfer_shift_ctrl) - addi a2,t2,%lo(xfer_shift_ctrl) - lbu s1,2(a2) - lbu a5,1(a2) + lui t1,%hi(xfer_shift_ctrl) + addi a2,t1,%lo(xfer_shift_ctrl) + lbu a5,2(a2) sb a1,2(a2) + li t0,3145728 + sw a5,0(sp) + lbu a5,1(a2) lbu a2,3(a2) - li t1,3145728 slli a5,a5,8 slli a2,a2,20 - and a2,a2,t1 + and a2,a2,t0 andi a5,a5,1792 or a5,a5,a2 - li t1,126976 + li t0,126976 slli a2,a1,12 - and a2,a2,t1 + and a2,a2,t0 or a5,a5,a2 addi a4,a4,-1 andi a4,a4,0xff - sb a4,%lo(xfer_shift_ctrl)(t2) + sb a4,%lo(xfer_shift_ctrl)(t1) andi a4,a4,63 or a5,a5,a4 #APP @@ -44,22 +45,21 @@ hrt_tx: slli a5,a1,16 and a5,a5,a4 ori a5,a5,4 - sw a5,4(sp) - li t1,0 - addi t0,t2,%lo(xfer_shift_ctrl) + li a2,0 + li t2,1 + sw a5,8(sp) .L3: lw a5,4(a0) - bltu t1,a5,.L14 + bltu a2,a5,.L14 .L1: - lw s0,12(sp) - lw s1,8(sp) - addi sp,sp,16 + lw s0,16(sp) + lw s1,12(sp) + addi sp,sp,20 jr ra .L14: lw a5,4(a0) - li a4,1 - sub a5,a5,t1 - beq a5,a4,.L4 + sub a5,a5,a2 + beq a5,t2,.L4 li a4,2 beq a5,a4,.L5 .L6: @@ -67,59 +67,59 @@ hrt_tx: li a5,0 beq a4,zero,.L7 lw a5,0(a0) - slli a4,t1,2 + slli a4,a2,2 add a5,a5,a4 lw a5,0(a5) j .L7 .L4: - lbu a2,1(t0) - lbu a5,2(t0) - li s0,126976 - slli a2,a2,8 - slli a5,a5,12 - and a5,a5,s0 - andi a2,a2,1792 - or a2,a2,a5 - lbu a4,8(a0) - lbu a5,3(t0) + addi s0,t1,%lo(xfer_shift_ctrl) + lbu t0,1(s0) + lbu a4,2(s0) + li s1,126976 + slli t0,t0,8 + slli a4,a4,12 + andi t0,t0,1792 + and a4,a4,s1 + or a4,t0,a4 + lbu a5,8(a0) + lbu t0,3(s0) li s0,3145728 - addi a4,a4,-1 - slli a5,a5,20 - andi a4,a4,0xff - and a5,a5,s0 - sb a4,%lo(xfer_shift_ctrl)(t2) - or a5,a2,a5 - andi a4,a4,63 - or a5,a5,a4 + addi a5,a5,-1 + slli t0,t0,20 + andi a5,a5,0xff + and t0,t0,s0 + sb a5,%lo(xfer_shift_ctrl)(t1) + or t0,a4,t0 + andi a5,a5,63 + or t0,t0,a5 #APP - csrw 3019, a5 + csrw 3019, t0 #NO_APP lw a5,12(a0) .L7: - beq a1,s1,.L8 + lw a4,0(sp) + beq a1,a4,.L8 .L9: #APP csrr a4, 3022 #NO_APP andi a4,a4,0xff bne a4,zero,.L9 - lw a4,4(sp) + lw a4,8(sp) #APP csrw 3043, a4 #NO_APP - mv s1,a1 .L8: lbu a4,16(a0) - andi a2,a4,0xff + andi t0,a4,0xff beq a4,zero,.L10 - li a4,1 - bne a2,a4,.L11 + bne t0,t2,.L11 #APP csrw 3017, a5 #NO_APP .L11: - bne t1,zero,.L12 - lw a5,0(sp) + bne a2,zero,.L12 + lw a5,4(sp) lbu a5,0(a5) bne a5,zero,.L12 mv a5,a3 @@ -131,34 +131,35 @@ hrt_tx: #APP csrw 2005, a3 #NO_APP - lw a5,0(sp) - li a4,1 - sb a4,0(a5) + lw a5,4(sp) + sb t2,0(a5) .L12: - addi t1,t1,1 + addi a2,a2,1 + sw a1,0(sp) j .L3 .L5: - lbu a2,1(t0) - lbu a5,2(t0) - li s0,126976 - slli a2,a2,8 - slli a5,a5,12 - and a5,a5,s0 - andi a2,a2,1792 - or a2,a2,a5 - lbu a4,9(a0) - lbu a5,3(t0) + addi s0,t1,%lo(xfer_shift_ctrl) + lbu t0,1(s0) + lbu a4,2(s0) + li s1,126976 + slli t0,t0,8 + slli a4,a4,12 + andi t0,t0,1792 + and a4,a4,s1 + or a4,t0,a4 + lbu a5,9(a0) + lbu t0,3(s0) li s0,3145728 - addi a4,a4,-1 - slli a5,a5,20 - andi a4,a4,0xff - and a5,a5,s0 - sb a4,%lo(xfer_shift_ctrl)(t2) - or a5,a2,a5 - andi a4,a4,63 - or a5,a5,a4 + addi a5,a5,-1 + slli t0,t0,20 + andi a5,a5,0xff + and t0,t0,s0 + sb a5,%lo(xfer_shift_ctrl)(t1) + or t0,a4,t0 + andi a5,a5,63 + or t0,t0,a5 #APP - csrw 3019, a5 + csrw 3019, t0 #NO_APP j .L6 .L10: @@ -194,18 +195,22 @@ hrt_write: bne a5,a3,.L21 li a5,3 .L22: - li a4,1 - beq a5,a4,.L23 - li a4,3 - beq a5,a4,.L24 - li a3,0 - bne a5,zero,.L25 - lbu a3,80(s0) -.L43: - andi a3,a3,0xff -.L25: - lui a4,%hi(xfer_shift_ctrl+2) - sb a3,%lo(xfer_shift_ctrl+2)(a4) + lbu a4,83(s0) + j .L42 +.L20: + andi a4,a5,0xff + li a3,1 + beq a4,a3,.L23 + li a3,3 + beq a4,a3,.L22 + bne a4,zero,.L36 + lbu a4,80(s0) +.L42: + andi a4,a4,0xff + mv a3,a4 +.L24: + lui a2,%hi(xfer_shift_ctrl+2) + sb a4,%lo(xfer_shift_ctrl+2)(a2) #APP csrw 2000, 2 #NO_APP @@ -234,38 +239,36 @@ hrt_write: li a2,1 add a5,s0,a5 lw a4,4(a5) - beq a4,a2,.L26 + beq a4,a2,.L25 li a2,2 - beq a4,a2,.L27 + beq a4,a2,.L26 li a5,32 div a5,a5,a3 - j .L44 -.L20: - andi a5,a5,0xff - j .L22 -.L23: - lbu a3,81(s0) j .L43 -.L24: - lbu a3,83(s0) - j .L43 -.L26: +.L23: + lbu a4,81(s0) + j .L42 +.L36: + li a4,0 + li a3,0 + j .L24 +.L25: lbu a5,8(a5) -.L44: +.L43: #APP csrw 3022, a5 #NO_APP - lbu a5,88(s0) - lbu a4,86(s0) - bne a5,zero,.L30 + lbu a4,88(s0) li a5,1 + bne a4,zero,.L29 + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrc 3008, a5 #NO_APP -.L31: +.L30: #APP csrr s1, 3008 #NO_APP @@ -290,30 +293,30 @@ hrt_write: addi a0,s0,60 call hrt_tx lbu a5,92(s0) - bne a5,zero,.L32 + bne a5,zero,.L31 li a5,4096 addi a5,a5,1 #APP csrw 3019, a5 #NO_APP - li a4,131072 - slli a5,s1,1 - addi a4,a4,-2 - and a5,a5,a4 + li a5,131072 + addi a5,a5,-2 + slli s1,s1,1 + and s1,s1,a5 #APP - csrw 3012, a5 + csrw 3012, s1 csrw 2000, 0 #NO_APP -.L33: +.L32: #APP csrw 2005, 0 #NO_APP lbu a5,87(s0) bne a5,zero,.L19 - lbu a5,88(s0) - lbu a4,86(s0) - bne a5,zero,.L36 + lbu a4,88(s0) li a5,1 + bne a4,zero,.L35 + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 @@ -326,24 +329,24 @@ hrt_write: lw s1,4(sp) addi sp,sp,16 jr ra -.L27: +.L26: lbu a5,9(a5) - j .L44 -.L30: - li a5,1 + j .L43 +.L29: + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrs 3008, a5 #NO_APP - j .L31 -.L32: + j .L30 +.L31: #APP csrr a5, 3022 #NO_APP andi a5,a5,0xff - bne a5,zero,.L32 + bne a5,zero,.L31 #APP csrw 2000, 0 #NO_APP @@ -354,21 +357,21 @@ hrt_write: #NO_APP lbu a4,92(s0) li a5,1 - bne a4,a5,.L34 + bne a4,a5,.L33 #APP - csrc 3008, 1 + csrc 3008, a5 #NO_APP - j .L33 -.L34: + j .L32 +.L33: lbu a4,92(s0) li a5,3 - bne a4,a5,.L33 + bne a4,a5,.L32 #APP csrs 3008, 1 #NO_APP - j .L33 -.L36: - li a5,1 + j .L32 +.L35: + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 @@ -402,34 +405,34 @@ hrt_read: andi t1,t1,0xff addi s1,s1,-1 andi s1,s1,0xff - bne a0,a2,.L46 + bne a0,a2,.L45 lbu a2,68(s0) addi a2,a2,-1 andi a2,a2,0xff sb a2,68(s0) -.L46: - lbu a2,88(s0) - lbu a0,86(s0) - bne a2,zero,.L47 +.L45: + lbu a0,88(s0) li a2,1 + bne a0,zero,.L46 + lbu a0,86(s0) sll a2,a2,a0 slli a2,a2,16 srli a2,a2,16 #APP csrc 3008, a2 #NO_APP -.L48: +.L47: #APP csrr a2, 3008 #NO_APP lw a0,4(s0) sw a2,0(sp) - bne a0,zero,.L49 + bne a0,zero,.L48 lw a0,24(s0) - bne a0,zero,.L49 + bne a0,zero,.L48 lw a0,44(s0) - beq a0,zero,.L50 -.L49: + beq a0,zero,.L49 +.L48: sw zero,64(s0) li a0,1 sb a0,87(s0) @@ -445,17 +448,17 @@ hrt_read: lw a4,12(sp) lw a3,8(sp) lw a5,4(sp) -.L50: +.L49: sw a4,64(s0) sb t1,87(s0) lbu t0,83(s0) li t1,1 li a0,4 - bleu t0,t1,.L51 + bleu t0,t1,.L50 lbu t1,83(s0) - beq t1,a0,.L79 + beq t1,a0,.L80 li a0,6 -.L51: +.L50: #APP csrr t1, 3009 #NO_APP @@ -516,18 +519,18 @@ hrt_read: csrw 3019, a0 csrw 3017, 0 #NO_APP - li a0,1 - bne a4,a0,.L52 - lbu t0,68(s0) + li t1,1 li a0,2 - bne t0,a0,.L53 + bne a4,t1,.L51 + lbu t1,68(s0) + bne t1,a0,.L52 lhu a4,84(s0) li a1,65536 or a4,a4,a1 #APP csrw 2002, a4 #NO_APP -.L54: +.L53: #APP csrr a1, 2005 csrr a4, 2005 @@ -536,7 +539,7 @@ hrt_read: slli a4,a4,16 srli a1,a1,16 srli a4,a4,16 - bne a1,a4,.L54 + bne a1,a4,.L53 lw a4,0(sp) slli a2,a4,24 #APP @@ -546,9 +549,9 @@ hrt_read: #NO_APP lbu a2,83(s0) li a3,8 - bne a2,a3,.L55 + bne a2,a3,.L54 srli a4,a4,16 -.L92: +.L95: sw a4,72(s0) #APP csrw 2000, 0 @@ -560,51 +563,72 @@ hrt_read: csrw 3019, s1 #NO_APP lbu a5,87(s0) - bne a5,zero,.L45 - lbu a5,88(s0) - lbu a4,86(s0) - bne a5,zero,.L77 + bne a5,zero,.L44 + lbu a4,88(s0) li a5,1 + bne a4,zero,.L78 + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrs 3008, a5 #NO_APP -.L45: +.L44: lw ra,32(sp) lw s0,28(sp) lw s1,24(sp) addi sp,sp,36 jr ra -.L47: - li a2,1 +.L46: + lbu a0,86(s0) sll a2,a2,a0 slli a2,a2,16 srli a2,a2,16 #APP csrs 3008, a2 #NO_APP - j .L48 -.L79: + j .L47 +.L80: li a0,30 - j .L51 -.L55: + j .L50 +.L54: srli a4,a4,24 + j .L95 +.L51: + bne a4,a0,.L88 + lbu a0,69(s0) j .L92 .L52: - li a0,2 - bne a4,a0,.L87 - lbu a0,69(s0) - addi a0,a0,-3 + lbu a0,68(s0) +.L92: + addi a0,a0,-1 + addi a0,a0,-2 andi a0,a0,63 + li t1,2097152 or a0,a0,a5 + addi t1,t1,1024 or a0,a0,t1 #APP csrw 3019, a0 #NO_APP + li t1,1 + addi a0,a4,-1 + beq a0,t1,.L60 + li t1,2 + beq a0,t1,.L61 + lbu a0,83(s0) + li s1,32 + div s1,s1,a0 + j .L93 +.L88: + lbu t1,83(s0) + li a0,32 + div a0,a0,t1 + j .L92 +.L60: lbu s1,68(s0) -.L90: +.L93: lhu a0,84(s0) li t1,65536 addi s1,s1,-1 @@ -626,9 +650,9 @@ hrt_read: addi a4,a4,-2 li t0,2 li t2,32 -.L63: - bne a4,a2,.L68 -.L69: +.L64: + bne a4,a2,.L69 +.L70: #APP csrr a1, 2005 csrr a4, 2005 @@ -637,7 +661,7 @@ hrt_read: slli a4,a4,16 srli a1,a1,16 srli a4,a4,16 - bne a1,a4,.L69 + bne a1,a4,.L70 lw a4,0(sp) slli a2,a4,24 #APP @@ -646,7 +670,7 @@ hrt_read: #NO_APP lbu a3,92(s0) li a4,3 - bne a3,a4,.L70 + bne a3,a4,.L71 #APP fence iorw,iorw csrr a3, 3018 @@ -654,7 +678,7 @@ hrt_read: #NO_APP lhu a2,84(s0) li a4,35 - bleu a2,a4,.L71 + bleu a2,a4,.L72 #APP csrw 2000, 0 #NO_APP @@ -665,23 +689,23 @@ hrt_read: #APP csrw 2005, a4 #NO_APP -.L71: +.L72: li a4,65536 addi a4,a4,-1 -.L72: +.L73: #APP csrr a2, 3010 #NO_APP slli a2,a2,16 srli a2,a2,16 - beq a2,a4,.L72 + beq a2,a4,.L73 lhu a2,84(s0) li a4,35 - bleu a2,a4,.L73 + bleu a2,a4,.L74 #APP csrw 2010, 0 #NO_APP -.L73: +.L74: #APP csrr a2, 3010 #NO_APP @@ -690,28 +714,29 @@ hrt_read: #APP csrs 3008, 1 #NO_APP - lbu a1,83(s0) - li a4,4 - beq a1,a4,.L80 - li t1,2 - li t0,4 -.L74: - slli a1,a3,24 + lbu a4,83(s0) + li a1,4 + li t0,2 + bne a4,a1,.L75 + li t0,1 + li a1,30 +.L75: + slli a0,a3,24 srli a4,a3,24 - or a4,a4,a1 - li a1,65536 - srli a0,a3,8 - addi a1,a1,-256 - and a0,a0,a1 - lbu t2,83(s0) or a4,a4,a0 + li a0,65536 + srli t1,a3,8 + addi a0,a0,-256 + and t1,t1,a0 + lbu t2,83(s0) + or a4,a4,t1 slli a3,a3,8 - li a0,16711680 - and a3,a3,a0 + li t1,16711680 + and a3,a3,t1 or a4,a4,a3 - and a2,a2,t0 + and a2,a2,a1 lbu a3,68(s0) - sra a2,a2,t1 + sra a2,a2,t0 sll a4,a4,t2 or a4,a4,a2 lbu a2,83(s0) @@ -724,55 +749,25 @@ hrt_read: srli a3,a4,24 or a3,a3,a2 srli a2,a4,8 - and a2,a2,a1 + and a2,a2,a0 slli a4,a4,8 or a3,a3,a2 - and a4,a4,a0 + and a4,a4,t1 or a4,a3,a4 - j .L92 -.L53: - lbu a0,68(s0) - addi a0,a0,-3 - andi a0,a0,63 - or a0,a0,a5 - or a0,a0,t1 - #APP - csrw 3019, a0 - #NO_APP - li a0,0 -.L60: - li t1,2 - bne a0,t1,.L62 + j .L95 +.L61: lbu s1,69(s0) - j .L90 -.L87: - lbu t0,83(s0) - li a0,32 - div a0,a0,t0 - addi a0,a0,-3 - andi a0,a0,63 - or a0,a0,a5 - or a0,a0,t1 - #APP - csrw 3019, a0 - #NO_APP - addi a0,a4,-1 - j .L60 -.L62: - lbu a0,83(s0) - li s1,32 - div s1,s1,a0 - j .L90 -.L68: + j .L93 +.L69: li a0,1 - beq a4,a0,.L64 - beq a4,t0,.L65 + beq a4,a0,.L65 + beq a4,t0,.L66 lbu s1,83(s0) div s1,t2,s1 - j .L91 -.L64: + j .L94 +.L65: lbu s1,68(s0) -.L91: +.L94: addi s1,s1,-1 andi s1,s1,0xff #APP @@ -787,15 +782,11 @@ hrt_read: #NO_APP addi a1,a1,4 addi a4,a4,-1 - j .L63 -.L65: + j .L64 +.L66: lbu s1,69(s0) - j .L91 -.L80: - li t1,1 - li t0,30 - j .L74 -.L70: + j .L94 +.L71: #APP csrr a4, 3018 #NO_APP @@ -805,16 +796,16 @@ hrt_read: li a3,32 sub a3,a3,a2 srl a4,a4,a3 - j .L92 -.L77: - li a5,1 + j .L95 +.L78: + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrc 3008, a5 #NO_APP - j .L45 + j .L44 .size hrt_read, .-hrt_read .section .sdata.xfer_shift_ctrl,"aw" .align 2 @@ -825,3 +816,4 @@ xfer_shift_ctrl: .byte 4 .byte 1 .byte 0 + .section .note.GNU-stack,"",@progbits diff --git a/applications/hpf/mspi/src/hrt/hrt-nrf54lm20a.s b/applications/hpf/mspi/src/hrt/hrt-nrf54lm20a.s index cf09170e3dcf..343ec3162a4d 100644 --- a/applications/hpf/mspi/src/hrt/hrt-nrf54lm20a.s +++ b/applications/hpf/mspi/src/hrt/hrt-nrf54lm20a.s @@ -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 @@ -9,32 +9,33 @@ .type hrt_tx, @function hrt_tx: lw a5,4(a0) - addi sp,sp,-16 - sw s0,12(sp) - sw s1,8(sp) - sw a2,0(sp) + addi sp,sp,-20 + sw s0,16(sp) + sw s1,12(sp) + sw a2,4(sp) beq a5,zero,.L1 li a4,32 div a4,a4,a1 - lui t2,%hi(xfer_shift_ctrl) - addi a2,t2,%lo(xfer_shift_ctrl) - lbu s1,2(a2) - lbu a5,1(a2) + lui t1,%hi(xfer_shift_ctrl) + addi a2,t1,%lo(xfer_shift_ctrl) + lbu a5,2(a2) sb a1,2(a2) + li t0,3145728 + sw a5,0(sp) + lbu a5,1(a2) lbu a2,3(a2) - li t1,3145728 slli a5,a5,8 slli a2,a2,20 - and a2,a2,t1 + and a2,a2,t0 andi a5,a5,1792 or a5,a5,a2 - li t1,126976 + li t0,126976 slli a2,a1,12 - and a2,a2,t1 + and a2,a2,t0 or a5,a5,a2 addi a4,a4,-1 andi a4,a4,0xff - sb a4,%lo(xfer_shift_ctrl)(t2) + sb a4,%lo(xfer_shift_ctrl)(t1) andi a4,a4,63 or a5,a5,a4 #APP @@ -44,22 +45,21 @@ hrt_tx: slli a5,a1,16 and a5,a5,a4 ori a5,a5,4 - sw a5,4(sp) - li t1,0 - addi t0,t2,%lo(xfer_shift_ctrl) + li a2,0 + li t2,1 + sw a5,8(sp) .L3: lw a5,4(a0) - bltu t1,a5,.L14 + bltu a2,a5,.L14 .L1: - lw s0,12(sp) - lw s1,8(sp) - addi sp,sp,16 + lw s0,16(sp) + lw s1,12(sp) + addi sp,sp,20 jr ra .L14: lw a5,4(a0) - li a4,1 - sub a5,a5,t1 - beq a5,a4,.L4 + sub a5,a5,a2 + beq a5,t2,.L4 li a4,2 beq a5,a4,.L5 .L6: @@ -67,59 +67,59 @@ hrt_tx: li a5,0 beq a4,zero,.L7 lw a5,0(a0) - slli a4,t1,2 + slli a4,a2,2 add a5,a5,a4 lw a5,0(a5) j .L7 .L4: - lbu a2,1(t0) - lbu a5,2(t0) - li s0,126976 - slli a2,a2,8 - slli a5,a5,12 - and a5,a5,s0 - andi a2,a2,1792 - or a2,a2,a5 - lbu a4,8(a0) - lbu a5,3(t0) + addi s0,t1,%lo(xfer_shift_ctrl) + lbu t0,1(s0) + lbu a4,2(s0) + li s1,126976 + slli t0,t0,8 + slli a4,a4,12 + andi t0,t0,1792 + and a4,a4,s1 + or a4,t0,a4 + lbu a5,8(a0) + lbu t0,3(s0) li s0,3145728 - addi a4,a4,-1 - slli a5,a5,20 - andi a4,a4,0xff - and a5,a5,s0 - sb a4,%lo(xfer_shift_ctrl)(t2) - or a5,a2,a5 - andi a4,a4,63 - or a5,a5,a4 + addi a5,a5,-1 + slli t0,t0,20 + andi a5,a5,0xff + and t0,t0,s0 + sb a5,%lo(xfer_shift_ctrl)(t1) + or t0,a4,t0 + andi a5,a5,63 + or t0,t0,a5 #APP - csrw 3019, a5 + csrw 3019, t0 #NO_APP lw a5,12(a0) .L7: - beq a1,s1,.L8 + lw a4,0(sp) + beq a1,a4,.L8 .L9: #APP csrr a4, 3022 #NO_APP andi a4,a4,0xff bne a4,zero,.L9 - lw a4,4(sp) + lw a4,8(sp) #APP csrw 3043, a4 #NO_APP - mv s1,a1 .L8: lbu a4,16(a0) - andi a2,a4,0xff + andi t0,a4,0xff beq a4,zero,.L10 - li a4,1 - bne a2,a4,.L11 + bne t0,t2,.L11 #APP csrw 3017, a5 #NO_APP .L11: - bne t1,zero,.L12 - lw a5,0(sp) + bne a2,zero,.L12 + lw a5,4(sp) lbu a5,0(a5) bne a5,zero,.L12 mv a5,a3 @@ -131,34 +131,35 @@ hrt_tx: #APP csrw 2005, a3 #NO_APP - lw a5,0(sp) - li a4,1 - sb a4,0(a5) + lw a5,4(sp) + sb t2,0(a5) .L12: - addi t1,t1,1 + addi a2,a2,1 + sw a1,0(sp) j .L3 .L5: - lbu a2,1(t0) - lbu a5,2(t0) - li s0,126976 - slli a2,a2,8 - slli a5,a5,12 - and a5,a5,s0 - andi a2,a2,1792 - or a2,a2,a5 - lbu a4,9(a0) - lbu a5,3(t0) + addi s0,t1,%lo(xfer_shift_ctrl) + lbu t0,1(s0) + lbu a4,2(s0) + li s1,126976 + slli t0,t0,8 + slli a4,a4,12 + andi t0,t0,1792 + and a4,a4,s1 + or a4,t0,a4 + lbu a5,9(a0) + lbu t0,3(s0) li s0,3145728 - addi a4,a4,-1 - slli a5,a5,20 - andi a4,a4,0xff - and a5,a5,s0 - sb a4,%lo(xfer_shift_ctrl)(t2) - or a5,a2,a5 - andi a4,a4,63 - or a5,a5,a4 + addi a5,a5,-1 + slli t0,t0,20 + andi a5,a5,0xff + and t0,t0,s0 + sb a5,%lo(xfer_shift_ctrl)(t1) + or t0,a4,t0 + andi a5,a5,63 + or t0,t0,a5 #APP - csrw 3019, a5 + csrw 3019, t0 #NO_APP j .L6 .L10: @@ -194,18 +195,22 @@ hrt_write: bne a5,a3,.L21 li a5,3 .L22: - li a4,1 - beq a5,a4,.L23 - li a4,3 - beq a5,a4,.L24 - li a3,0 - bne a5,zero,.L25 - lbu a3,80(s0) -.L43: - andi a3,a3,0xff -.L25: - lui a4,%hi(xfer_shift_ctrl+2) - sb a3,%lo(xfer_shift_ctrl+2)(a4) + lbu a4,83(s0) + j .L42 +.L20: + andi a4,a5,0xff + li a3,1 + beq a4,a3,.L23 + li a3,3 + beq a4,a3,.L22 + bne a4,zero,.L36 + lbu a4,80(s0) +.L42: + andi a4,a4,0xff + mv a3,a4 +.L24: + lui a2,%hi(xfer_shift_ctrl+2) + sb a4,%lo(xfer_shift_ctrl+2)(a2) #APP csrw 2000, 2 #NO_APP @@ -234,38 +239,36 @@ hrt_write: li a2,1 add a5,s0,a5 lw a4,4(a5) - beq a4,a2,.L26 + beq a4,a2,.L25 li a2,2 - beq a4,a2,.L27 + beq a4,a2,.L26 li a5,32 div a5,a5,a3 - j .L44 -.L20: - andi a5,a5,0xff - j .L22 -.L23: - lbu a3,81(s0) - j .L43 -.L24: - lbu a3,83(s0) j .L43 -.L26: +.L23: + lbu a4,81(s0) + j .L42 +.L36: + li a4,0 + li a3,0 + j .L24 +.L25: lbu a5,8(a5) -.L44: +.L43: #APP csrw 3022, a5 #NO_APP - lbu a5,88(s0) - lbu a4,86(s0) - bne a5,zero,.L30 + lbu a4,88(s0) li a5,1 + bne a4,zero,.L29 + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrc 3008, a5 #NO_APP -.L31: +.L30: #APP csrr s1, 3008 #NO_APP @@ -290,30 +293,30 @@ hrt_write: addi a0,s0,60 call hrt_tx lbu a5,92(s0) - bne a5,zero,.L32 + bne a5,zero,.L31 li a5,4096 addi a5,a5,1 #APP csrw 3019, a5 #NO_APP - li a4,131072 - slli a5,s1,1 - addi a4,a4,-2 - and a5,a5,a4 + li a5,131072 + addi a5,a5,-2 + slli s1,s1,1 + and s1,s1,a5 #APP - csrw 3012, a5 + csrw 3012, s1 csrw 2000, 0 #NO_APP -.L33: +.L32: #APP csrw 2005, 0 #NO_APP lbu a5,87(s0) bne a5,zero,.L19 - lbu a5,88(s0) - lbu a4,86(s0) - bne a5,zero,.L36 + lbu a4,88(s0) li a5,1 + bne a4,zero,.L35 + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 @@ -326,24 +329,24 @@ hrt_write: lw s1,4(sp) addi sp,sp,16 jr ra -.L27: +.L26: lbu a5,9(a5) - j .L44 -.L30: - li a5,1 + j .L43 +.L29: + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrs 3008, a5 #NO_APP - j .L31 -.L32: + j .L30 +.L31: #APP csrr a5, 3022 #NO_APP andi a5,a5,0xff - bne a5,zero,.L32 + bne a5,zero,.L31 #APP csrw 2000, 0 #NO_APP @@ -354,21 +357,21 @@ hrt_write: #NO_APP lbu a4,92(s0) li a5,1 - bne a4,a5,.L34 + bne a4,a5,.L33 #APP - csrc 3008, 1 + csrc 3008, a5 #NO_APP - j .L33 -.L34: + j .L32 +.L33: lbu a4,92(s0) li a5,3 - bne a4,a5,.L33 + bne a4,a5,.L32 #APP csrs 3008, 1 #NO_APP - j .L33 -.L36: - li a5,1 + j .L32 +.L35: + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 @@ -392,30 +395,30 @@ hrt_read: lw s1,64(a0) lbu a3,87(a0) lw a2,60(a0) - lbu a5,88(a0) - lbu a1,86(a0) + lbu a1,88(a0) mv s0,a0 andi a4,a4,0xff andi a3,a3,0xff - bne a5,zero,.L46 li a5,1 + bne a1,zero,.L45 + lbu a1,86(a0) sll a5,a5,a1 slli a5,a5,16 srli a5,a5,16 #APP csrc 3008, a5 #NO_APP -.L47: +.L46: #APP csrr a5, 3008 #NO_APP lw a5,4(s0) - bne a5,zero,.L48 + bne a5,zero,.L47 lw a5,24(s0) - bne a5,zero,.L48 + bne a5,zero,.L47 lw a5,44(s0) - beq a5,zero,.L49 -.L48: + beq a5,zero,.L48 +.L47: sw zero,64(s0) li a5,1 sb a5,87(s0) @@ -427,7 +430,7 @@ hrt_read: lw a2,8(sp) lw a3,4(sp) lw a4,0(sp) -.L49: +.L48: sw s1,64(s0) sb a3,87(s0) #APP @@ -437,11 +440,11 @@ hrt_read: lbu a1,83(s0) li a3,1 li a5,4 - bleu a1,a3,.L50 + bleu a1,a3,.L49 lbu a3,83(s0) - beq a3,a5,.L70 + beq a3,a5,.L69 li a5,6 -.L50: +.L49: #APP csrr a3, 3009 #NO_APP @@ -464,28 +467,28 @@ hrt_read: csrw 3043, a5 #NO_APP li a5,1 - beq s1,a5,.L51 + beq s1,a5,.L50 li a5,2 - beq s1,a5,.L52 + beq s1,a5,.L51 lbu a3,83(s0) li a5,32 div a5,a5,a3 - j .L81 -.L46: - li a5,1 + j .L80 +.L45: + lbu a1,86(a0) sll a5,a5,a1 slli a5,a5,16 srli a5,a5,16 #APP csrs 3008, a5 #NO_APP - j .L47 -.L70: + j .L46 +.L69: li a5,30 - j .L50 -.L51: + j .L49 +.L50: lbu a5,68(s0) -.L81: +.L80: addi a5,a5,-1 andi a5,a5,255 #APP @@ -535,45 +538,45 @@ hrt_read: addi a3,s1,-1 li a0,2 li t1,32 -.L55: - bne a3,zero,.L60 +.L54: + bne a3,zero,.L59 #APP csrw 3023, 0 #NO_APP -.L61: +.L60: #APP csrr a5, 3021 #NO_APP andi a5,a5,0xff - bne a5,zero,.L61 + bne a5,zero,.L60 #APP csrw 2010, 0 #NO_APP lbu a5,92(s0) - beq a5,zero,.L62 + beq a5,zero,.L61 lbu a3,92(s0) li a5,2 - bne a3,a5,.L63 -.L62: + bne a3,a5,.L62 +.L61: #APP csrw 2010, 0 #NO_APP -.L63: +.L62: #APP csrw 2000, 0 csrw 2001, 0 csrr a5, 3018 #NO_APP li a3,1 - bne s1,a3,.L64 + bne s1,a3,.L63 lbu a2,68(s0) li a3,2 - bne a2,a3,.L64 + bne a2,a3,.L63 lbu a2,83(s0) li a3,8 - bne a2,a3,.L65 + bne a2,a3,.L64 srli a5,a5,16 -.L83: +.L82: sw a5,72(s0) #APP csrw 2010, 0 @@ -582,35 +585,35 @@ hrt_read: csrw 3011, 0 #NO_APP lbu a5,87(s0) - bne a5,zero,.L45 - lbu a5,88(s0) - lbu a4,86(s0) - bne a5,zero,.L68 + bne a5,zero,.L44 + lbu a4,88(s0) li a5,1 + bne a4,zero,.L67 + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrs 3008, a5 #NO_APP -.L45: +.L44: lw ra,20(sp) lw s0,16(sp) lw s1,12(sp) addi sp,sp,24 jr ra -.L52: +.L51: lbu a5,69(s0) - j .L81 -.L60: - beq a3,a1,.L56 - beq a3,a0,.L57 + j .L80 +.L59: + beq a3,a1,.L55 + beq a3,a0,.L56 lbu a5,83(s0) div a5,t1,a5 - j .L82 -.L56: + j .L81 +.L55: lbu a5,68(s0) -.L82: +.L81: addi a5,a5,-1 andi a5,a5,255 #APP @@ -620,30 +623,30 @@ hrt_read: sw a5,0(a2) addi a3,a3,-1 addi a2,a2,4 - j .L55 -.L57: + j .L54 +.L56: lbu a5,69(s0) - j .L82 -.L65: - srli a5,a5,24 - j .L83 + j .L81 .L64: + srli a5,a5,24 + j .L82 +.L63: lbu a2,68(s0) lbu a3,83(s0) mul a2,a2,a3 li a3,32 sub a3,a3,a2 srl a5,a5,a3 - j .L83 -.L68: - li a5,1 + j .L82 +.L67: + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrc 3008, a5 #NO_APP - j .L45 + j .L44 .size hrt_read, .-hrt_read .section .sdata.xfer_shift_ctrl,"aw" .align 2 @@ -654,3 +657,4 @@ xfer_shift_ctrl: .byte 4 .byte 1 .byte 0 + .section .note.GNU-stack,"",@progbits diff --git a/applications/hpf/mspi/src/hrt/hrt-nrf54lm20b.s b/applications/hpf/mspi/src/hrt/hrt-nrf54lm20b.s index cf09170e3dcf..343ec3162a4d 100644 --- a/applications/hpf/mspi/src/hrt/hrt-nrf54lm20b.s +++ b/applications/hpf/mspi/src/hrt/hrt-nrf54lm20b.s @@ -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 @@ -9,32 +9,33 @@ .type hrt_tx, @function hrt_tx: lw a5,4(a0) - addi sp,sp,-16 - sw s0,12(sp) - sw s1,8(sp) - sw a2,0(sp) + addi sp,sp,-20 + sw s0,16(sp) + sw s1,12(sp) + sw a2,4(sp) beq a5,zero,.L1 li a4,32 div a4,a4,a1 - lui t2,%hi(xfer_shift_ctrl) - addi a2,t2,%lo(xfer_shift_ctrl) - lbu s1,2(a2) - lbu a5,1(a2) + lui t1,%hi(xfer_shift_ctrl) + addi a2,t1,%lo(xfer_shift_ctrl) + lbu a5,2(a2) sb a1,2(a2) + li t0,3145728 + sw a5,0(sp) + lbu a5,1(a2) lbu a2,3(a2) - li t1,3145728 slli a5,a5,8 slli a2,a2,20 - and a2,a2,t1 + and a2,a2,t0 andi a5,a5,1792 or a5,a5,a2 - li t1,126976 + li t0,126976 slli a2,a1,12 - and a2,a2,t1 + and a2,a2,t0 or a5,a5,a2 addi a4,a4,-1 andi a4,a4,0xff - sb a4,%lo(xfer_shift_ctrl)(t2) + sb a4,%lo(xfer_shift_ctrl)(t1) andi a4,a4,63 or a5,a5,a4 #APP @@ -44,22 +45,21 @@ hrt_tx: slli a5,a1,16 and a5,a5,a4 ori a5,a5,4 - sw a5,4(sp) - li t1,0 - addi t0,t2,%lo(xfer_shift_ctrl) + li a2,0 + li t2,1 + sw a5,8(sp) .L3: lw a5,4(a0) - bltu t1,a5,.L14 + bltu a2,a5,.L14 .L1: - lw s0,12(sp) - lw s1,8(sp) - addi sp,sp,16 + lw s0,16(sp) + lw s1,12(sp) + addi sp,sp,20 jr ra .L14: lw a5,4(a0) - li a4,1 - sub a5,a5,t1 - beq a5,a4,.L4 + sub a5,a5,a2 + beq a5,t2,.L4 li a4,2 beq a5,a4,.L5 .L6: @@ -67,59 +67,59 @@ hrt_tx: li a5,0 beq a4,zero,.L7 lw a5,0(a0) - slli a4,t1,2 + slli a4,a2,2 add a5,a5,a4 lw a5,0(a5) j .L7 .L4: - lbu a2,1(t0) - lbu a5,2(t0) - li s0,126976 - slli a2,a2,8 - slli a5,a5,12 - and a5,a5,s0 - andi a2,a2,1792 - or a2,a2,a5 - lbu a4,8(a0) - lbu a5,3(t0) + addi s0,t1,%lo(xfer_shift_ctrl) + lbu t0,1(s0) + lbu a4,2(s0) + li s1,126976 + slli t0,t0,8 + slli a4,a4,12 + andi t0,t0,1792 + and a4,a4,s1 + or a4,t0,a4 + lbu a5,8(a0) + lbu t0,3(s0) li s0,3145728 - addi a4,a4,-1 - slli a5,a5,20 - andi a4,a4,0xff - and a5,a5,s0 - sb a4,%lo(xfer_shift_ctrl)(t2) - or a5,a2,a5 - andi a4,a4,63 - or a5,a5,a4 + addi a5,a5,-1 + slli t0,t0,20 + andi a5,a5,0xff + and t0,t0,s0 + sb a5,%lo(xfer_shift_ctrl)(t1) + or t0,a4,t0 + andi a5,a5,63 + or t0,t0,a5 #APP - csrw 3019, a5 + csrw 3019, t0 #NO_APP lw a5,12(a0) .L7: - beq a1,s1,.L8 + lw a4,0(sp) + beq a1,a4,.L8 .L9: #APP csrr a4, 3022 #NO_APP andi a4,a4,0xff bne a4,zero,.L9 - lw a4,4(sp) + lw a4,8(sp) #APP csrw 3043, a4 #NO_APP - mv s1,a1 .L8: lbu a4,16(a0) - andi a2,a4,0xff + andi t0,a4,0xff beq a4,zero,.L10 - li a4,1 - bne a2,a4,.L11 + bne t0,t2,.L11 #APP csrw 3017, a5 #NO_APP .L11: - bne t1,zero,.L12 - lw a5,0(sp) + bne a2,zero,.L12 + lw a5,4(sp) lbu a5,0(a5) bne a5,zero,.L12 mv a5,a3 @@ -131,34 +131,35 @@ hrt_tx: #APP csrw 2005, a3 #NO_APP - lw a5,0(sp) - li a4,1 - sb a4,0(a5) + lw a5,4(sp) + sb t2,0(a5) .L12: - addi t1,t1,1 + addi a2,a2,1 + sw a1,0(sp) j .L3 .L5: - lbu a2,1(t0) - lbu a5,2(t0) - li s0,126976 - slli a2,a2,8 - slli a5,a5,12 - and a5,a5,s0 - andi a2,a2,1792 - or a2,a2,a5 - lbu a4,9(a0) - lbu a5,3(t0) + addi s0,t1,%lo(xfer_shift_ctrl) + lbu t0,1(s0) + lbu a4,2(s0) + li s1,126976 + slli t0,t0,8 + slli a4,a4,12 + andi t0,t0,1792 + and a4,a4,s1 + or a4,t0,a4 + lbu a5,9(a0) + lbu t0,3(s0) li s0,3145728 - addi a4,a4,-1 - slli a5,a5,20 - andi a4,a4,0xff - and a5,a5,s0 - sb a4,%lo(xfer_shift_ctrl)(t2) - or a5,a2,a5 - andi a4,a4,63 - or a5,a5,a4 + addi a5,a5,-1 + slli t0,t0,20 + andi a5,a5,0xff + and t0,t0,s0 + sb a5,%lo(xfer_shift_ctrl)(t1) + or t0,a4,t0 + andi a5,a5,63 + or t0,t0,a5 #APP - csrw 3019, a5 + csrw 3019, t0 #NO_APP j .L6 .L10: @@ -194,18 +195,22 @@ hrt_write: bne a5,a3,.L21 li a5,3 .L22: - li a4,1 - beq a5,a4,.L23 - li a4,3 - beq a5,a4,.L24 - li a3,0 - bne a5,zero,.L25 - lbu a3,80(s0) -.L43: - andi a3,a3,0xff -.L25: - lui a4,%hi(xfer_shift_ctrl+2) - sb a3,%lo(xfer_shift_ctrl+2)(a4) + lbu a4,83(s0) + j .L42 +.L20: + andi a4,a5,0xff + li a3,1 + beq a4,a3,.L23 + li a3,3 + beq a4,a3,.L22 + bne a4,zero,.L36 + lbu a4,80(s0) +.L42: + andi a4,a4,0xff + mv a3,a4 +.L24: + lui a2,%hi(xfer_shift_ctrl+2) + sb a4,%lo(xfer_shift_ctrl+2)(a2) #APP csrw 2000, 2 #NO_APP @@ -234,38 +239,36 @@ hrt_write: li a2,1 add a5,s0,a5 lw a4,4(a5) - beq a4,a2,.L26 + beq a4,a2,.L25 li a2,2 - beq a4,a2,.L27 + beq a4,a2,.L26 li a5,32 div a5,a5,a3 - j .L44 -.L20: - andi a5,a5,0xff - j .L22 -.L23: - lbu a3,81(s0) - j .L43 -.L24: - lbu a3,83(s0) j .L43 -.L26: +.L23: + lbu a4,81(s0) + j .L42 +.L36: + li a4,0 + li a3,0 + j .L24 +.L25: lbu a5,8(a5) -.L44: +.L43: #APP csrw 3022, a5 #NO_APP - lbu a5,88(s0) - lbu a4,86(s0) - bne a5,zero,.L30 + lbu a4,88(s0) li a5,1 + bne a4,zero,.L29 + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrc 3008, a5 #NO_APP -.L31: +.L30: #APP csrr s1, 3008 #NO_APP @@ -290,30 +293,30 @@ hrt_write: addi a0,s0,60 call hrt_tx lbu a5,92(s0) - bne a5,zero,.L32 + bne a5,zero,.L31 li a5,4096 addi a5,a5,1 #APP csrw 3019, a5 #NO_APP - li a4,131072 - slli a5,s1,1 - addi a4,a4,-2 - and a5,a5,a4 + li a5,131072 + addi a5,a5,-2 + slli s1,s1,1 + and s1,s1,a5 #APP - csrw 3012, a5 + csrw 3012, s1 csrw 2000, 0 #NO_APP -.L33: +.L32: #APP csrw 2005, 0 #NO_APP lbu a5,87(s0) bne a5,zero,.L19 - lbu a5,88(s0) - lbu a4,86(s0) - bne a5,zero,.L36 + lbu a4,88(s0) li a5,1 + bne a4,zero,.L35 + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 @@ -326,24 +329,24 @@ hrt_write: lw s1,4(sp) addi sp,sp,16 jr ra -.L27: +.L26: lbu a5,9(a5) - j .L44 -.L30: - li a5,1 + j .L43 +.L29: + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrs 3008, a5 #NO_APP - j .L31 -.L32: + j .L30 +.L31: #APP csrr a5, 3022 #NO_APP andi a5,a5,0xff - bne a5,zero,.L32 + bne a5,zero,.L31 #APP csrw 2000, 0 #NO_APP @@ -354,21 +357,21 @@ hrt_write: #NO_APP lbu a4,92(s0) li a5,1 - bne a4,a5,.L34 + bne a4,a5,.L33 #APP - csrc 3008, 1 + csrc 3008, a5 #NO_APP - j .L33 -.L34: + j .L32 +.L33: lbu a4,92(s0) li a5,3 - bne a4,a5,.L33 + bne a4,a5,.L32 #APP csrs 3008, 1 #NO_APP - j .L33 -.L36: - li a5,1 + j .L32 +.L35: + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 @@ -392,30 +395,30 @@ hrt_read: lw s1,64(a0) lbu a3,87(a0) lw a2,60(a0) - lbu a5,88(a0) - lbu a1,86(a0) + lbu a1,88(a0) mv s0,a0 andi a4,a4,0xff andi a3,a3,0xff - bne a5,zero,.L46 li a5,1 + bne a1,zero,.L45 + lbu a1,86(a0) sll a5,a5,a1 slli a5,a5,16 srli a5,a5,16 #APP csrc 3008, a5 #NO_APP -.L47: +.L46: #APP csrr a5, 3008 #NO_APP lw a5,4(s0) - bne a5,zero,.L48 + bne a5,zero,.L47 lw a5,24(s0) - bne a5,zero,.L48 + bne a5,zero,.L47 lw a5,44(s0) - beq a5,zero,.L49 -.L48: + beq a5,zero,.L48 +.L47: sw zero,64(s0) li a5,1 sb a5,87(s0) @@ -427,7 +430,7 @@ hrt_read: lw a2,8(sp) lw a3,4(sp) lw a4,0(sp) -.L49: +.L48: sw s1,64(s0) sb a3,87(s0) #APP @@ -437,11 +440,11 @@ hrt_read: lbu a1,83(s0) li a3,1 li a5,4 - bleu a1,a3,.L50 + bleu a1,a3,.L49 lbu a3,83(s0) - beq a3,a5,.L70 + beq a3,a5,.L69 li a5,6 -.L50: +.L49: #APP csrr a3, 3009 #NO_APP @@ -464,28 +467,28 @@ hrt_read: csrw 3043, a5 #NO_APP li a5,1 - beq s1,a5,.L51 + beq s1,a5,.L50 li a5,2 - beq s1,a5,.L52 + beq s1,a5,.L51 lbu a3,83(s0) li a5,32 div a5,a5,a3 - j .L81 -.L46: - li a5,1 + j .L80 +.L45: + lbu a1,86(a0) sll a5,a5,a1 slli a5,a5,16 srli a5,a5,16 #APP csrs 3008, a5 #NO_APP - j .L47 -.L70: + j .L46 +.L69: li a5,30 - j .L50 -.L51: + j .L49 +.L50: lbu a5,68(s0) -.L81: +.L80: addi a5,a5,-1 andi a5,a5,255 #APP @@ -535,45 +538,45 @@ hrt_read: addi a3,s1,-1 li a0,2 li t1,32 -.L55: - bne a3,zero,.L60 +.L54: + bne a3,zero,.L59 #APP csrw 3023, 0 #NO_APP -.L61: +.L60: #APP csrr a5, 3021 #NO_APP andi a5,a5,0xff - bne a5,zero,.L61 + bne a5,zero,.L60 #APP csrw 2010, 0 #NO_APP lbu a5,92(s0) - beq a5,zero,.L62 + beq a5,zero,.L61 lbu a3,92(s0) li a5,2 - bne a3,a5,.L63 -.L62: + bne a3,a5,.L62 +.L61: #APP csrw 2010, 0 #NO_APP -.L63: +.L62: #APP csrw 2000, 0 csrw 2001, 0 csrr a5, 3018 #NO_APP li a3,1 - bne s1,a3,.L64 + bne s1,a3,.L63 lbu a2,68(s0) li a3,2 - bne a2,a3,.L64 + bne a2,a3,.L63 lbu a2,83(s0) li a3,8 - bne a2,a3,.L65 + bne a2,a3,.L64 srli a5,a5,16 -.L83: +.L82: sw a5,72(s0) #APP csrw 2010, 0 @@ -582,35 +585,35 @@ hrt_read: csrw 3011, 0 #NO_APP lbu a5,87(s0) - bne a5,zero,.L45 - lbu a5,88(s0) - lbu a4,86(s0) - bne a5,zero,.L68 + bne a5,zero,.L44 + lbu a4,88(s0) li a5,1 + bne a4,zero,.L67 + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrs 3008, a5 #NO_APP -.L45: +.L44: lw ra,20(sp) lw s0,16(sp) lw s1,12(sp) addi sp,sp,24 jr ra -.L52: +.L51: lbu a5,69(s0) - j .L81 -.L60: - beq a3,a1,.L56 - beq a3,a0,.L57 + j .L80 +.L59: + beq a3,a1,.L55 + beq a3,a0,.L56 lbu a5,83(s0) div a5,t1,a5 - j .L82 -.L56: + j .L81 +.L55: lbu a5,68(s0) -.L82: +.L81: addi a5,a5,-1 andi a5,a5,255 #APP @@ -620,30 +623,30 @@ hrt_read: sw a5,0(a2) addi a3,a3,-1 addi a2,a2,4 - j .L55 -.L57: + j .L54 +.L56: lbu a5,69(s0) - j .L82 -.L65: - srli a5,a5,24 - j .L83 + j .L81 .L64: + srli a5,a5,24 + j .L82 +.L63: lbu a2,68(s0) lbu a3,83(s0) mul a2,a2,a3 li a3,32 sub a3,a3,a2 srl a5,a5,a3 - j .L83 -.L68: - li a5,1 + j .L82 +.L67: + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrc 3008, a5 #NO_APP - j .L45 + j .L44 .size hrt_read, .-hrt_read .section .sdata.xfer_shift_ctrl,"aw" .align 2 @@ -654,3 +657,4 @@ xfer_shift_ctrl: .byte 4 .byte 1 .byte 0 + .section .note.GNU-stack,"",@progbits diff --git a/applications/hpf/mspi/src/hrt/hrt-nrf54lv10a.s b/applications/hpf/mspi/src/hrt/hrt-nrf54lv10a.s index cf09170e3dcf..343ec3162a4d 100644 --- a/applications/hpf/mspi/src/hrt/hrt-nrf54lv10a.s +++ b/applications/hpf/mspi/src/hrt/hrt-nrf54lv10a.s @@ -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 @@ -9,32 +9,33 @@ .type hrt_tx, @function hrt_tx: lw a5,4(a0) - addi sp,sp,-16 - sw s0,12(sp) - sw s1,8(sp) - sw a2,0(sp) + addi sp,sp,-20 + sw s0,16(sp) + sw s1,12(sp) + sw a2,4(sp) beq a5,zero,.L1 li a4,32 div a4,a4,a1 - lui t2,%hi(xfer_shift_ctrl) - addi a2,t2,%lo(xfer_shift_ctrl) - lbu s1,2(a2) - lbu a5,1(a2) + lui t1,%hi(xfer_shift_ctrl) + addi a2,t1,%lo(xfer_shift_ctrl) + lbu a5,2(a2) sb a1,2(a2) + li t0,3145728 + sw a5,0(sp) + lbu a5,1(a2) lbu a2,3(a2) - li t1,3145728 slli a5,a5,8 slli a2,a2,20 - and a2,a2,t1 + and a2,a2,t0 andi a5,a5,1792 or a5,a5,a2 - li t1,126976 + li t0,126976 slli a2,a1,12 - and a2,a2,t1 + and a2,a2,t0 or a5,a5,a2 addi a4,a4,-1 andi a4,a4,0xff - sb a4,%lo(xfer_shift_ctrl)(t2) + sb a4,%lo(xfer_shift_ctrl)(t1) andi a4,a4,63 or a5,a5,a4 #APP @@ -44,22 +45,21 @@ hrt_tx: slli a5,a1,16 and a5,a5,a4 ori a5,a5,4 - sw a5,4(sp) - li t1,0 - addi t0,t2,%lo(xfer_shift_ctrl) + li a2,0 + li t2,1 + sw a5,8(sp) .L3: lw a5,4(a0) - bltu t1,a5,.L14 + bltu a2,a5,.L14 .L1: - lw s0,12(sp) - lw s1,8(sp) - addi sp,sp,16 + lw s0,16(sp) + lw s1,12(sp) + addi sp,sp,20 jr ra .L14: lw a5,4(a0) - li a4,1 - sub a5,a5,t1 - beq a5,a4,.L4 + sub a5,a5,a2 + beq a5,t2,.L4 li a4,2 beq a5,a4,.L5 .L6: @@ -67,59 +67,59 @@ hrt_tx: li a5,0 beq a4,zero,.L7 lw a5,0(a0) - slli a4,t1,2 + slli a4,a2,2 add a5,a5,a4 lw a5,0(a5) j .L7 .L4: - lbu a2,1(t0) - lbu a5,2(t0) - li s0,126976 - slli a2,a2,8 - slli a5,a5,12 - and a5,a5,s0 - andi a2,a2,1792 - or a2,a2,a5 - lbu a4,8(a0) - lbu a5,3(t0) + addi s0,t1,%lo(xfer_shift_ctrl) + lbu t0,1(s0) + lbu a4,2(s0) + li s1,126976 + slli t0,t0,8 + slli a4,a4,12 + andi t0,t0,1792 + and a4,a4,s1 + or a4,t0,a4 + lbu a5,8(a0) + lbu t0,3(s0) li s0,3145728 - addi a4,a4,-1 - slli a5,a5,20 - andi a4,a4,0xff - and a5,a5,s0 - sb a4,%lo(xfer_shift_ctrl)(t2) - or a5,a2,a5 - andi a4,a4,63 - or a5,a5,a4 + addi a5,a5,-1 + slli t0,t0,20 + andi a5,a5,0xff + and t0,t0,s0 + sb a5,%lo(xfer_shift_ctrl)(t1) + or t0,a4,t0 + andi a5,a5,63 + or t0,t0,a5 #APP - csrw 3019, a5 + csrw 3019, t0 #NO_APP lw a5,12(a0) .L7: - beq a1,s1,.L8 + lw a4,0(sp) + beq a1,a4,.L8 .L9: #APP csrr a4, 3022 #NO_APP andi a4,a4,0xff bne a4,zero,.L9 - lw a4,4(sp) + lw a4,8(sp) #APP csrw 3043, a4 #NO_APP - mv s1,a1 .L8: lbu a4,16(a0) - andi a2,a4,0xff + andi t0,a4,0xff beq a4,zero,.L10 - li a4,1 - bne a2,a4,.L11 + bne t0,t2,.L11 #APP csrw 3017, a5 #NO_APP .L11: - bne t1,zero,.L12 - lw a5,0(sp) + bne a2,zero,.L12 + lw a5,4(sp) lbu a5,0(a5) bne a5,zero,.L12 mv a5,a3 @@ -131,34 +131,35 @@ hrt_tx: #APP csrw 2005, a3 #NO_APP - lw a5,0(sp) - li a4,1 - sb a4,0(a5) + lw a5,4(sp) + sb t2,0(a5) .L12: - addi t1,t1,1 + addi a2,a2,1 + sw a1,0(sp) j .L3 .L5: - lbu a2,1(t0) - lbu a5,2(t0) - li s0,126976 - slli a2,a2,8 - slli a5,a5,12 - and a5,a5,s0 - andi a2,a2,1792 - or a2,a2,a5 - lbu a4,9(a0) - lbu a5,3(t0) + addi s0,t1,%lo(xfer_shift_ctrl) + lbu t0,1(s0) + lbu a4,2(s0) + li s1,126976 + slli t0,t0,8 + slli a4,a4,12 + andi t0,t0,1792 + and a4,a4,s1 + or a4,t0,a4 + lbu a5,9(a0) + lbu t0,3(s0) li s0,3145728 - addi a4,a4,-1 - slli a5,a5,20 - andi a4,a4,0xff - and a5,a5,s0 - sb a4,%lo(xfer_shift_ctrl)(t2) - or a5,a2,a5 - andi a4,a4,63 - or a5,a5,a4 + addi a5,a5,-1 + slli t0,t0,20 + andi a5,a5,0xff + and t0,t0,s0 + sb a5,%lo(xfer_shift_ctrl)(t1) + or t0,a4,t0 + andi a5,a5,63 + or t0,t0,a5 #APP - csrw 3019, a5 + csrw 3019, t0 #NO_APP j .L6 .L10: @@ -194,18 +195,22 @@ hrt_write: bne a5,a3,.L21 li a5,3 .L22: - li a4,1 - beq a5,a4,.L23 - li a4,3 - beq a5,a4,.L24 - li a3,0 - bne a5,zero,.L25 - lbu a3,80(s0) -.L43: - andi a3,a3,0xff -.L25: - lui a4,%hi(xfer_shift_ctrl+2) - sb a3,%lo(xfer_shift_ctrl+2)(a4) + lbu a4,83(s0) + j .L42 +.L20: + andi a4,a5,0xff + li a3,1 + beq a4,a3,.L23 + li a3,3 + beq a4,a3,.L22 + bne a4,zero,.L36 + lbu a4,80(s0) +.L42: + andi a4,a4,0xff + mv a3,a4 +.L24: + lui a2,%hi(xfer_shift_ctrl+2) + sb a4,%lo(xfer_shift_ctrl+2)(a2) #APP csrw 2000, 2 #NO_APP @@ -234,38 +239,36 @@ hrt_write: li a2,1 add a5,s0,a5 lw a4,4(a5) - beq a4,a2,.L26 + beq a4,a2,.L25 li a2,2 - beq a4,a2,.L27 + beq a4,a2,.L26 li a5,32 div a5,a5,a3 - j .L44 -.L20: - andi a5,a5,0xff - j .L22 -.L23: - lbu a3,81(s0) - j .L43 -.L24: - lbu a3,83(s0) j .L43 -.L26: +.L23: + lbu a4,81(s0) + j .L42 +.L36: + li a4,0 + li a3,0 + j .L24 +.L25: lbu a5,8(a5) -.L44: +.L43: #APP csrw 3022, a5 #NO_APP - lbu a5,88(s0) - lbu a4,86(s0) - bne a5,zero,.L30 + lbu a4,88(s0) li a5,1 + bne a4,zero,.L29 + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrc 3008, a5 #NO_APP -.L31: +.L30: #APP csrr s1, 3008 #NO_APP @@ -290,30 +293,30 @@ hrt_write: addi a0,s0,60 call hrt_tx lbu a5,92(s0) - bne a5,zero,.L32 + bne a5,zero,.L31 li a5,4096 addi a5,a5,1 #APP csrw 3019, a5 #NO_APP - li a4,131072 - slli a5,s1,1 - addi a4,a4,-2 - and a5,a5,a4 + li a5,131072 + addi a5,a5,-2 + slli s1,s1,1 + and s1,s1,a5 #APP - csrw 3012, a5 + csrw 3012, s1 csrw 2000, 0 #NO_APP -.L33: +.L32: #APP csrw 2005, 0 #NO_APP lbu a5,87(s0) bne a5,zero,.L19 - lbu a5,88(s0) - lbu a4,86(s0) - bne a5,zero,.L36 + lbu a4,88(s0) li a5,1 + bne a4,zero,.L35 + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 @@ -326,24 +329,24 @@ hrt_write: lw s1,4(sp) addi sp,sp,16 jr ra -.L27: +.L26: lbu a5,9(a5) - j .L44 -.L30: - li a5,1 + j .L43 +.L29: + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrs 3008, a5 #NO_APP - j .L31 -.L32: + j .L30 +.L31: #APP csrr a5, 3022 #NO_APP andi a5,a5,0xff - bne a5,zero,.L32 + bne a5,zero,.L31 #APP csrw 2000, 0 #NO_APP @@ -354,21 +357,21 @@ hrt_write: #NO_APP lbu a4,92(s0) li a5,1 - bne a4,a5,.L34 + bne a4,a5,.L33 #APP - csrc 3008, 1 + csrc 3008, a5 #NO_APP - j .L33 -.L34: + j .L32 +.L33: lbu a4,92(s0) li a5,3 - bne a4,a5,.L33 + bne a4,a5,.L32 #APP csrs 3008, 1 #NO_APP - j .L33 -.L36: - li a5,1 + j .L32 +.L35: + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 @@ -392,30 +395,30 @@ hrt_read: lw s1,64(a0) lbu a3,87(a0) lw a2,60(a0) - lbu a5,88(a0) - lbu a1,86(a0) + lbu a1,88(a0) mv s0,a0 andi a4,a4,0xff andi a3,a3,0xff - bne a5,zero,.L46 li a5,1 + bne a1,zero,.L45 + lbu a1,86(a0) sll a5,a5,a1 slli a5,a5,16 srli a5,a5,16 #APP csrc 3008, a5 #NO_APP -.L47: +.L46: #APP csrr a5, 3008 #NO_APP lw a5,4(s0) - bne a5,zero,.L48 + bne a5,zero,.L47 lw a5,24(s0) - bne a5,zero,.L48 + bne a5,zero,.L47 lw a5,44(s0) - beq a5,zero,.L49 -.L48: + beq a5,zero,.L48 +.L47: sw zero,64(s0) li a5,1 sb a5,87(s0) @@ -427,7 +430,7 @@ hrt_read: lw a2,8(sp) lw a3,4(sp) lw a4,0(sp) -.L49: +.L48: sw s1,64(s0) sb a3,87(s0) #APP @@ -437,11 +440,11 @@ hrt_read: lbu a1,83(s0) li a3,1 li a5,4 - bleu a1,a3,.L50 + bleu a1,a3,.L49 lbu a3,83(s0) - beq a3,a5,.L70 + beq a3,a5,.L69 li a5,6 -.L50: +.L49: #APP csrr a3, 3009 #NO_APP @@ -464,28 +467,28 @@ hrt_read: csrw 3043, a5 #NO_APP li a5,1 - beq s1,a5,.L51 + beq s1,a5,.L50 li a5,2 - beq s1,a5,.L52 + beq s1,a5,.L51 lbu a3,83(s0) li a5,32 div a5,a5,a3 - j .L81 -.L46: - li a5,1 + j .L80 +.L45: + lbu a1,86(a0) sll a5,a5,a1 slli a5,a5,16 srli a5,a5,16 #APP csrs 3008, a5 #NO_APP - j .L47 -.L70: + j .L46 +.L69: li a5,30 - j .L50 -.L51: + j .L49 +.L50: lbu a5,68(s0) -.L81: +.L80: addi a5,a5,-1 andi a5,a5,255 #APP @@ -535,45 +538,45 @@ hrt_read: addi a3,s1,-1 li a0,2 li t1,32 -.L55: - bne a3,zero,.L60 +.L54: + bne a3,zero,.L59 #APP csrw 3023, 0 #NO_APP -.L61: +.L60: #APP csrr a5, 3021 #NO_APP andi a5,a5,0xff - bne a5,zero,.L61 + bne a5,zero,.L60 #APP csrw 2010, 0 #NO_APP lbu a5,92(s0) - beq a5,zero,.L62 + beq a5,zero,.L61 lbu a3,92(s0) li a5,2 - bne a3,a5,.L63 -.L62: + bne a3,a5,.L62 +.L61: #APP csrw 2010, 0 #NO_APP -.L63: +.L62: #APP csrw 2000, 0 csrw 2001, 0 csrr a5, 3018 #NO_APP li a3,1 - bne s1,a3,.L64 + bne s1,a3,.L63 lbu a2,68(s0) li a3,2 - bne a2,a3,.L64 + bne a2,a3,.L63 lbu a2,83(s0) li a3,8 - bne a2,a3,.L65 + bne a2,a3,.L64 srli a5,a5,16 -.L83: +.L82: sw a5,72(s0) #APP csrw 2010, 0 @@ -582,35 +585,35 @@ hrt_read: csrw 3011, 0 #NO_APP lbu a5,87(s0) - bne a5,zero,.L45 - lbu a5,88(s0) - lbu a4,86(s0) - bne a5,zero,.L68 + bne a5,zero,.L44 + lbu a4,88(s0) li a5,1 + bne a4,zero,.L67 + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrs 3008, a5 #NO_APP -.L45: +.L44: lw ra,20(sp) lw s0,16(sp) lw s1,12(sp) addi sp,sp,24 jr ra -.L52: +.L51: lbu a5,69(s0) - j .L81 -.L60: - beq a3,a1,.L56 - beq a3,a0,.L57 + j .L80 +.L59: + beq a3,a1,.L55 + beq a3,a0,.L56 lbu a5,83(s0) div a5,t1,a5 - j .L82 -.L56: + j .L81 +.L55: lbu a5,68(s0) -.L82: +.L81: addi a5,a5,-1 andi a5,a5,255 #APP @@ -620,30 +623,30 @@ hrt_read: sw a5,0(a2) addi a3,a3,-1 addi a2,a2,4 - j .L55 -.L57: + j .L54 +.L56: lbu a5,69(s0) - j .L82 -.L65: - srli a5,a5,24 - j .L83 + j .L81 .L64: + srli a5,a5,24 + j .L82 +.L63: lbu a2,68(s0) lbu a3,83(s0) mul a2,a2,a3 li a3,32 sub a3,a3,a2 srl a5,a5,a3 - j .L83 -.L68: - li a5,1 + j .L82 +.L67: + lbu a4,86(s0) sll a5,a5,a4 slli a5,a5,16 srli a5,a5,16 #APP csrc 3008, a5 #NO_APP - j .L45 + j .L44 .size hrt_read, .-hrt_read .section .sdata.xfer_shift_ctrl,"aw" .align 2 @@ -654,3 +657,4 @@ xfer_shift_ctrl: .byte 4 .byte 1 .byte 0 + .section .note.GNU-stack,"",@progbits diff --git a/applications/installer/src/main.c b/applications/installer/src/main.c index e00ead7131c0..79a8ff21cb20 100644 --- a/applications/installer/src/main.c +++ b/applications/installer/src/main.c @@ -28,12 +28,12 @@ LOG_MODULE_REGISTER(installer, CONFIG_INSTALLER_LOG_LEVEL); extern uintptr_t _flash_used; #define INSTALLER_SLOT DT_NODELABEL(slot0_partition) -#define INSTALLER_SLOT_ADDRESS FIXED_PARTITION_NODE_ADDRESS(INSTALLER_SLOT) -#define INSTALLER_SLOT_SIZE FIXED_PARTITION_NODE_SIZE(INSTALLER_SLOT) -#define INSTALLER_SLOT_ID DT_FIXED_PARTITION_ID(INSTALLER_SLOT) +#define INSTALLER_SLOT_ADDRESS PARTITION_NODE_ADDRESS(INSTALLER_SLOT) +#define INSTALLER_SLOT_SIZE PARTITION_NODE_SIZE(INSTALLER_SLOT) +#define INSTALLER_SLOT_ID DT_PARTITION_ID(INSTALLER_SLOT) #define INSTALLER_CODE_PARTITION DT_CHOSEN(zephyr_code_partition) -#define INSTALLER_CODE_PARTITION_ADDRESS FIXED_PARTITION_NODE_ADDRESS(INSTALLER_CODE_PARTITION) +#define INSTALLER_CODE_PARTITION_ADDRESS PARTITION_NODE_ADDRESS(INSTALLER_CODE_PARTITION) /** * Offset from the start of the slot the installer resides to the actual image flash start. @@ -46,8 +46,8 @@ extern uintptr_t _flash_used; #define INSTALLER_FLASH_USED_OFFSET (INSTALLER_CODE_PARTITION_ADDRESS - INSTALLER_SLOT_ADDRESS) #define FW_LOADER_SLOT DT_NODELABEL(slot1_partition) -#define FW_LOADER_SLOT_ID DT_FIXED_PARTITION_ID(FW_LOADER_SLOT) -#define FW_LOADER_SLOT_SIZE FIXED_PARTITION_NODE_SIZE(FW_LOADER_SLOT) +#define FW_LOADER_SLOT_ID DT_PARTITION_ID(FW_LOADER_SLOT) +#define FW_LOADER_SLOT_SIZE PARTITION_NODE_SIZE(FW_LOADER_SLOT) #define BUFFER_SIZE 4096 #define ERASE_BLOCK_SIZE DT_PROP(DT_CHOSEN(zephyr_flash), erase_block_size) diff --git a/applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay index ed1b1e20686e..33331951e6cb 100644 --- a/applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay +++ b/applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay @@ -32,11 +32,15 @@ /* This duplicates the Application core configuration to build PPR image under valid address. */ &mram1x { partitions { + ranges; + cpuapp_slot0_partition: slot0_partition: partition@30000 { + compatible = "zephyr,mapped-partition"; reg = <0x30000 0x82000>; }; cpurad_slot0_partition: partition@b2000 { + compatible = "zephyr,mapped-partition"; reg = <0xb2000 0x32000>; }; }; diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/applications/machine_learning/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.overlay index 92b4aa2cc0f5..727498233a10 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/applications/machine_learning/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -16,11 +16,15 @@ &mram1x { partitions { + ranges; + cpuapp_slot0_partition: partition@30000 { + compatible = "zephyr,mapped-partition"; reg = <0x30000 0x82000>; }; slot0_partition: cpurad_slot0_partition: partition@b2000 { + compatible = "zephyr,mapped-partition"; reg = <0xb2000 0x32000>; }; }; diff --git a/applications/machine_learning/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/applications/machine_learning/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf index 5f5df34719ce..3c40b44ef045 100644 --- a/applications/machine_learning/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf +++ b/applications/machine_learning/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf @@ -10,7 +10,7 @@ CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_MAX_IMG_SECTORS=2048 CONFIG_BOOT_SIGNATURE_TYPE_RSA=y diff --git a/applications/machine_learning/sysbuild/mcuboot/prj.conf b/applications/machine_learning/sysbuild/mcuboot/prj.conf index aac044a100c7..58e53c959d1d 100644 --- a/applications/machine_learning/sysbuild/mcuboot/prj.conf +++ b/applications/machine_learning/sysbuild/mcuboot/prj.conf @@ -7,7 +7,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/applications/matter_bridge/sysbuild/mcuboot/prj.conf b/applications/matter_bridge/sysbuild/mcuboot/prj.conf index b3a5b0287a06..00a8ca231df3 100644 --- a/applications/matter_bridge/sysbuild/mcuboot/prj.conf +++ b/applications/matter_bridge/sysbuild/mcuboot/prj.conf @@ -13,6 +13,8 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" + # Bootloader size optimization CONFIG_CBPRINTF_NANO=y CONFIG_PRINTK=n diff --git a/applications/matter_weather_station/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/applications/matter_weather_station/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf index becd9f45f4e8..8fd98233672c 100644 --- a/applications/matter_weather_station/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf +++ b/applications/matter_weather_station/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf @@ -17,7 +17,7 @@ CONFIG_NCS_APPLICATION_BOOT_BANNER_STRING="MCUboot" CONFIG_SYSTEM_CLOCK_NO_WAIT=y -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SIGNATURE_TYPE_RSA=y diff --git a/applications/nrf5340_audio/Kconfig.defaults b/applications/nrf5340_audio/Kconfig.defaults index 680dd4fedf6f..c9797f8e2c8c 100644 --- a/applications/nrf5340_audio/Kconfig.defaults +++ b/applications/nrf5340_audio/Kconfig.defaults @@ -11,8 +11,8 @@ config MAIN_THREAD_PRIORITY default 10 config MAIN_STACK_SIZE - default 1800 if SD_CARD_PLAYBACK - default 1600 + default 2500 if SD_CARD_PLAYBACK + default 2000 config SYSTEM_WORKQUEUE_STACK_SIZE default 2000 diff --git a/applications/nrf5340_audio/prj.conf b/applications/nrf5340_audio/prj.conf index 6897552adb3d..ca02ee1bd7df 100644 --- a/applications/nrf5340_audio/prj.conf +++ b/applications/nrf5340_audio/prj.conf @@ -19,6 +19,7 @@ CONFIG_INIT_STACKS=y CONFIG_BT=y CONFIG_NET_BUF_POOL_USAGE=y CONFIG_BT_RX_STACK_SIZE=2500 +CONFIG_POLL=y # Uart driver CONFIG_SERIAL=y diff --git a/applications/nrf5340_audio/prj_release.conf b/applications/nrf5340_audio/prj_release.conf index f30975748e6e..f8655c77f93e 100644 --- a/applications/nrf5340_audio/prj_release.conf +++ b/applications/nrf5340_audio/prj_release.conf @@ -22,6 +22,7 @@ CONFIG_UART_CONSOLE=n CONFIG_BOOT_BANNER=n CONFIG_NET_BUF_POOL_USAGE=y CONFIG_BT_RX_STACK_SIZE=2500 +CONFIG_POLL=y # BT related configs CONFIG_BT_ISO_TX_BUF_COUNT=3 diff --git a/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/server_store.c b/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/server_store.c index a9026e55e5e8..23ffa5dc9521 100644 --- a/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/server_store.c +++ b/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/server_store.c @@ -561,13 +561,13 @@ static bool stream_check_pd(struct bt_cap_stream *existing_stream, void *user_da /* The existing stream is not in the same group as the incoming stream */ LOG_ERR("Existing stream not in same group as incoming stream"); ctx->ret = -EINVAL; - return true; + return false; } if (pres_dly_stream_ignore(&(existing_stream->bap_stream), ctx->incoming_stream)) { /* Do not consider this stream. Continue parsing */ LOG_DBG("Ignoring existing stream"); - return false; + return true; } /* All already running streams in the same direction and in the @@ -581,13 +581,13 @@ static bool stream_check_pd(struct bt_cap_stream *existing_stream, void *user_da LOG_ERR("Illegal value. Pres delays do not match: %u != %u", *ctx->existing_pres_dly_us_check, *ctx->existing_pres_dly_us); ctx->ret = -EINVAL; - return true; + return false; } if (*ctx->existing_pres_dly_us == 0) { LOG_ERR("Existing presentation delay is zero"); ctx->ret = -EINVAL; - return true; + return false; } if (IN_RANGE(*ctx->existing_pres_dly_us, ctx->incoming_qos->pd_min, @@ -595,7 +595,7 @@ static bool stream_check_pd(struct bt_cap_stream *existing_stream, void *user_da *ctx->computed_pres_dly_us = *ctx->existing_pres_dly_us; LOG_INF("Existing pres delay is within the incoming stream QoS range"); ctx->existing_pres_dly_already_in_range = true; - return true; + return false; } *ctx->group_reconfig_needed = true; @@ -603,11 +603,12 @@ static bool stream_check_pd(struct bt_cap_stream *existing_stream, void *user_da ctx->ret = pres_delay_compute(ctx->common_qos, &existing_stream->bap_stream.ep->qos_pref); if (ctx->ret) { - return true; + LOG_ERR("Failed to compute common presentation delay: %d", ctx->ret); + return false; } /* Continue iteration */ - return false; + return true; } /* Find the presentation delay. Needs to be the same within a CIG for a given direction */ diff --git a/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c b/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c index be4cf5d9dd8f..9938a972240c 100644 --- a/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c +++ b/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c @@ -356,10 +356,10 @@ static bool stream_in_group_check(struct bt_cap_stream *stream, void *user_data) if (stream == server_stream) { /* Found the stream in the group, stop iterating */ - return true; + return false; } - return false; + return true; } /** @@ -936,7 +936,7 @@ static bool new_pres_dly_us_set(struct bt_cap_stream *stream, void *user_data) stream->bap_stream.qos->pd = *new_pres_dly_us; - return false; + return true; } static void stream_configured_cb(struct bt_bap_stream *stream, @@ -1110,10 +1110,10 @@ static bool all_streams_released_check(struct bt_cap_stream *stream, void *user_ if (stream->bap_stream.ep != NULL) { LOG_DBG("stream %p is not released", stream); /* Found a stream that is not released, will stop iterating */ - return true; + return false; } - return false; + return true; } static void stream_released_cb(struct bt_bap_stream *stream) @@ -1300,7 +1300,7 @@ static bool first_source_location_get(struct bt_cap_stream *stream, void *user_d if (stream == NULL || user_data == NULL) { LOG_ERR("Invalid parameters"); - return false; + return true; } enum bt_audio_location *locations = (enum bt_audio_location *)user_data; @@ -1315,7 +1315,7 @@ static bool first_source_location_get(struct bt_cap_stream *stream, void *user_d if ((dir != BT_AUDIO_DIR_SOURCE) || (idx.lvl1 != 0) || (idx.lvl2 != 0) || (idx.lvl3 != 0)) { /* Not the first source stream, continue searching */ - return false; + return true; } ret = bt_audio_codec_cfg_get_chan_allocation(stream->bap_stream.codec_cfg, locations, @@ -1326,7 +1326,7 @@ static bool first_source_location_get(struct bt_cap_stream *stream, void *user_d } /* Found the first source stream, stop iterating */ - return true; + return false; } int le_audio_concurrent_sync_num_get(uint8_t *num_streams, enum bt_audio_location *locations) @@ -1681,12 +1681,12 @@ static bool add_to_stop_params(struct bt_cap_stream *stream, void *user_data) if (stream->bap_stream.ep == NULL) { /* Stream already released */ - return false; + return true; } param->streams[param->count++] = stream; - return false; + return true; } static bool server_connected_check(struct bt_cap_stream *stream, void *user_data) @@ -1698,16 +1698,16 @@ static bool server_connected_check(struct bt_cap_stream *stream, void *user_data ret = srv_store_from_stream_get(&stream->bap_stream, &server); if (ret) { LOG_ERR("Failed to get server from stream: %d", ret); - return false; + return true; } if (server && is_connected(server->conn)) { *connected_server_found = true; /* Found a connected server, will stop iterating */ - return true; + return false; } - return false; + return true; } int unicast_client_stop(uint8_t cig_index) diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf index 766f2f59bfcc..a3e065bf592c 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf @@ -9,7 +9,7 @@ CONFIG_SIZE_OPTIMIZATIONS=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=4096 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf index 839b75f299a8..24db4a582e07 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf @@ -9,7 +9,7 @@ CONFIG_SIZE_OPTIMIZATIONS=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=4096 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf index 80758a0b95da..c690be0d21f6 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf @@ -11,7 +11,7 @@ CONFIG_HW_STACK_PROTECTION=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf index f5297b7d6917..8c64e51cf0a1 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf @@ -11,7 +11,7 @@ CONFIG_HW_STACK_PROTECTION=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf index e3ce5ea3f74b..6e3b45bb9a9a 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf @@ -11,7 +11,7 @@ CONFIG_HW_STACK_PROTECTION=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf index 80758a0b95da..c690be0d21f6 100644 --- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf @@ -11,7 +11,7 @@ CONFIG_HW_STACK_PROTECTION=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf index aa2f4f9daf87..9856c4cd20c0 100644 --- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf @@ -11,7 +11,7 @@ CONFIG_HW_STACK_PROTECTION=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf index 3c815a5466cb..0fcf7e4e81a3 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf @@ -10,7 +10,7 @@ CONFIG_HW_STACK_PROTECTION=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf index 809237547262..f1135b9445e2 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf @@ -10,7 +10,7 @@ CONFIG_HW_STACK_PROTECTION=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf index 85cae1bb7b80..3500353267bd 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf @@ -10,7 +10,7 @@ CONFIG_HW_STACK_PROTECTION=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf index 4b57aa793207..ca396ca3bae6 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf @@ -10,7 +10,7 @@ CONFIG_HW_STACK_PROTECTION=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf index f9bb589093e7..43659a98c930 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf @@ -10,7 +10,7 @@ CONFIG_HW_STACK_PROTECTION=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf index 1297fd5a8cf3..e606c34e46b3 100644 --- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf @@ -10,7 +10,7 @@ CONFIG_HW_STACK_PROTECTION=y CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_BOOT_BOOTSTRAP=n diff --git a/applications/nrf_desktop/src/modules/dfu.c b/applications/nrf_desktop/src/modules/dfu.c index 808bf41dcabb..68e78e9b8f17 100644 --- a/applications/nrf_desktop/src/modules/dfu.c +++ b/applications/nrf_desktop/src/modules/dfu.c @@ -130,10 +130,10 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_LOG_LEVEL); #define MCUBOOT_PRIMARY_NODE DT_NODELABEL(slot0_partition) #define MCUBOOT_SECONDARY_NODE DT_NODELABEL(slot1_partition) - BUILD_ASSERT(UTIL_OR(DT_FIXED_PARTITION_EXISTS(MCUBOOT_PRIMARY_NODE), + BUILD_ASSERT(UTIL_OR(DT_PARTITION_EXISTS(MCUBOOT_PRIMARY_NODE), DT_FIXED_SUBPARTITION_EXISTS(MCUBOOT_PRIMARY_NODE)), "Missing primary partition definition in DTS."); - BUILD_ASSERT(UTIL_OR(DT_FIXED_PARTITION_EXISTS(MCUBOOT_SECONDARY_NODE), + BUILD_ASSERT(UTIL_OR(DT_PARTITION_EXISTS(MCUBOOT_SECONDARY_NODE), DT_FIXED_SUBPARTITION_EXISTS(MCUBOOT_SECONDARY_NODE)), "Missing secondary partition definition in DTS."); @@ -141,7 +141,7 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_LOG_LEVEL); #define NVM_ADDRESS(node) \ (COND_CODE_1(DT_FIXED_SUBPARTITION_EXISTS(node), \ (DT_FIXED_SUBPARTITION_ADDR(node)), \ - (DT_FIXED_PARTITION_ADDR(node)))) + (DT_PARTITION_ADDR(node)))) #define CODE_PARTITION_START_ADDR NVM_ADDRESS(CODE_PARTITION_NODE) #define MCUBOOT_PRIMARY_START_ADDR NVM_ADDRESS(MCUBOOT_PRIMARY_NODE) #define MCUBOOT_SECONDARY_START_ADDR NVM_ADDRESS(MCUBOOT_SECONDARY_NODE) @@ -154,8 +154,8 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_LOG_LEVEL); #error Primary and secondary partitions cannot have the same address. #endif - #define MCUBOOT_PRIMARY_SLOT_ID DT_FIXED_PARTITION_ID(MCUBOOT_PRIMARY_NODE) - #define MCUBOOT_SECONDARY_SLOT_ID DT_FIXED_PARTITION_ID(MCUBOOT_SECONDARY_NODE) + #define MCUBOOT_PRIMARY_SLOT_ID DT_PARTITION_ID(MCUBOOT_PRIMARY_NODE) + #define MCUBOOT_SECONDARY_SLOT_ID DT_PARTITION_ID(MCUBOOT_SECONDARY_NODE) #if BUILD_TIME_DFU_SLOT_ID_INFO_IS_AVAILABLE /* Use range check to allow for placing MCUboot header in a separate diff --git a/applications/nrf_desktop/src/modules/failsafe.c b/applications/nrf_desktop/src/modules/failsafe.c index c0debf183e98..d041c121f594 100644 --- a/applications/nrf_desktop/src/modules/failsafe.c +++ b/applications/nrf_desktop/src/modules/failsafe.c @@ -38,11 +38,11 @@ static int failsafe_check(bool *failure_detected) static int failsafe_erase(void) { const struct flash_area *flash_area; - int err = flash_area_open(FIXED_PARTITION_ID(storage_partition), + int err = flash_area_open(PARTITION_ID(storage_partition), &flash_area); if (!err) { err = flash_area_erase(flash_area, 0, - FIXED_PARTITION_SIZE(storage_partition)); + PARTITION_SIZE(storage_partition)); flash_area_close(flash_area); } diff --git a/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820.dts b/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820.dts index d25170b8ce73..7658c4b6ee3e 100644 --- a/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820.dts +++ b/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820.dts @@ -120,26 +120,30 @@ * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions */ partitions { - compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + ranges; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x000000000 0xd000>; }; slot0_partition: partition@d000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000d000 0x30000>; }; slot1_partition: partition@3d000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x0003d000 0x1000>; }; storage_partition: partition@3e000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x0003e000 0x00002000>; }; diff --git a/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833.dts b/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833.dts index 8e88573665b4..f9fc25c1216a 100644 --- a/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833.dts +++ b/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833.dts @@ -125,31 +125,36 @@ * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions */ partitions { - compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + ranges; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x000000000 0xc000>; }; slot0_partition: partition@c000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000c000 0x32000>; }; slot1_partition: partition@3e000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x0003e000 0x32000>; }; scratch_partition: partition@70000 { + compatible = "zephyr,mapped-partition"; label = "image-scratch"; reg = <0x00070000 0xa000>; }; storage_partition: partition@7a000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x0007a000 0x00006000>; }; diff --git a/boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840.dts b/boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840.dts index f8681888a7f5..bca723994bec 100644 --- a/boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840.dts +++ b/boards/nordic/nrf52840gmouse/nrf52840gmouse_nrf52840.dts @@ -115,31 +115,36 @@ * http://docs.zephyrproject.org/devices/dts/flash_partitions.html */ partitions { - compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + ranges; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x000000000 0x0000c000>; }; slot0_partition: partition@c000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000c000 0x000069000>; }; slot1_partition: partition@75000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x00075000 0x000069000>; }; scratch_partition: partition@de000 { + compatible = "zephyr,mapped-partition"; label = "image-scratch"; reg = <0x000de000 0x0001e000>; }; storage_partition: partition@fc000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000fc000 0x00004000>; }; diff --git a/boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832.dts b/boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832.dts index da60da484d8f..8dc229ac39cd 100644 --- a/boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832.dts +++ b/boards/nordic/nrf52dmouse/nrf52dmouse_nrf52832.dts @@ -87,31 +87,36 @@ * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions */ partitions { - compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + ranges; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 0x0000c000>; }; slot0_partition: partition@c000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000c000 0x00036000>; }; slot1_partition: partition@42000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x00042000 0x00036000>; }; scratch_partition: partition@78000 { + compatible = "zephyr,mapped-partition"; label = "image-scratch"; reg = <0x00078000 0x00004000>; }; storage_partition: partition@7c000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x0007c000 0x00004000>; }; diff --git a/boards/nordic/nrf52kbd/nrf52kbd_nrf52832.dts b/boards/nordic/nrf52kbd/nrf52kbd_nrf52832.dts index fd34cfeb6062..d5b1a10a5d69 100644 --- a/boards/nordic/nrf52kbd/nrf52kbd_nrf52832.dts +++ b/boards/nordic/nrf52kbd/nrf52kbd_nrf52832.dts @@ -67,31 +67,36 @@ * http://docs.zephyrproject.org/devices/dts/flash_partitions.html */ partitions { - compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + ranges; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x000000000 0x0000c000>; }; slot0_partition: partition@c000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000c000 0x000036000>; }; slot1_partition: partition@42000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x00042000 0x000036000>; }; scratch_partition: partition@78000 { + compatible = "zephyr,mapped-partition"; label = "image-scratch"; reg = <0x00078000 0x00004000>; }; storage_partition: partition@7c000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x0007c000 0x00004000>; }; diff --git a/boards/nordic/nrf54lm20dongle/nrf54lm20b_cpuapp_common.dtsi b/boards/nordic/nrf54lm20dongle/nrf54lm20b_cpuapp_common.dtsi index 2b535ae2d160..58cd4e8203b4 100644 --- a/boards/nordic/nrf54lm20dongle/nrf54lm20b_cpuapp_common.dtsi +++ b/boards/nordic/nrf54lm20dongle/nrf54lm20b_cpuapp_common.dtsi @@ -116,6 +116,10 @@ status = "okay"; }; +&vregusb { + status = "okay"; +}; + zephyr_udc0: &usbhs { status = "okay"; diff --git a/boards/nordic/nrf54lm20dongle/nrf54lm20dongle_nrf54lm20b_cpuflpr.dts b/boards/nordic/nrf54lm20dongle/nrf54lm20dongle_nrf54lm20b_cpuflpr.dts index 4072e2aa9ec7..3b0c4dced96e 100644 --- a/boards/nordic/nrf54lm20dongle/nrf54lm20dongle_nrf54lm20b_cpuflpr.dts +++ b/boards/nordic/nrf54lm20dongle/nrf54lm20dongle_nrf54lm20b_cpuflpr.dts @@ -27,11 +27,12 @@ &cpuflpr_rram { partitions { - compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + ranges; cpuflpr_code_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(96)>; }; diff --git a/boards/nordic/nrf54ls05dk/nrf54ls05_a_b_cpuapp_common.dtsi b/boards/nordic/nrf54ls05dk/nrf54ls05_a_b_cpuapp_common.dtsi index 41f37a2d567e..f4a32cb44733 100644 --- a/boards/nordic/nrf54ls05dk/nrf54ls05_a_b_cpuapp_common.dtsi +++ b/boards/nordic/nrf54ls05dk/nrf54ls05_a_b_cpuapp_common.dtsi @@ -48,28 +48,31 @@ &cpuapp_rram { partitions { - compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; ranges; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; /* FPROTECT requires partition to be max 62k */ reg = <0x0 DT_SIZE_K(62)>; }; slot0_partition: partition@10000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x10000 DT_SIZE_K(204)>; }; slot1_partition: partition@43000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x43000 DT_SIZE_K(204)>; }; storage_partition: partition@76000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x76000 DT_SIZE_K(36)>; }; diff --git a/boards/nordic/nrf54lv10dk/nrf54lv10dk_nrf54lv10a_cpuapp.dts b/boards/nordic/nrf54lv10dk/nrf54lv10dk_nrf54lv10a_cpuapp.dts index 296b38b9f785..471b8209777e 100644 --- a/boards/nordic/nrf54lv10dk/nrf54lv10dk_nrf54lv10a_cpuapp.dts +++ b/boards/nordic/nrf54lv10dk/nrf54lv10dk_nrf54lv10a_cpuapp.dts @@ -21,28 +21,31 @@ &cpuapp_rram { partitions { - compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; ranges; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; /* FPROTECT allows maximum size of 62k */ reg = <0x0 DT_SIZE_K(62)>; }; slot0_partition: partition@10000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x10000 DT_SIZE_K(212)>; }; slot1_partition: partition@7a000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x7a000 DT_SIZE_K(212)>; }; storage_partition: partition@e4000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0xe4000 DT_SIZE_K(36)>; }; diff --git a/boards/nordic/nrf54lv10dk/nrf54lv10dk_nrf54lv10a_cpuflpr.dts b/boards/nordic/nrf54lv10dk/nrf54lv10dk_nrf54lv10a_cpuflpr.dts index 3a90c229af2f..65e1b50c9b75 100644 --- a/boards/nordic/nrf54lv10dk/nrf54lv10dk_nrf54lv10a_cpuflpr.dts +++ b/boards/nordic/nrf54lv10dk/nrf54lv10dk_nrf54lv10a_cpuflpr.dts @@ -27,12 +27,12 @@ &cpuflpr_rram { partitions { - compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; ranges; cpuflpr_code_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(64)>; }; diff --git a/boards/nordic/thingy91/thingy91_nrf52840.dts b/boards/nordic/thingy91/thingy91_nrf52840.dts index 977268222960..47e022a2515b 100644 --- a/boards/nordic/thingy91/thingy91_nrf52840.dts +++ b/boards/nordic/thingy91/thingy91_nrf52840.dts @@ -76,34 +76,39 @@ zephyr_udc0: &usbd { &flash0 { partitions { - compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + ranges; /* The size of this partition ensures that MCUBoot can be built * with an RTT console, CDC ACM support, and w/o optimizations. */ boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x000000000 0x00012000>; }; slot0_partition: partition@12000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00012000 0x000069000>; }; slot1_partition: partition@7b000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x0007b000 0x000069000>; }; scratch_partition: partition@e4000 { + compatible = "zephyr,mapped-partition"; label = "image-scratch"; reg = <0x000e4000 0x00018000>; }; storage_partition: partition@fc000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000fc000 0x00004000>; }; diff --git a/boards/nordic/thingy91/thingy91_nrf9160_partition.dtsi b/boards/nordic/thingy91/thingy91_nrf9160_partition.dtsi index 1eb674c104c6..c7a2aed8defd 100644 --- a/boards/nordic/thingy91/thingy91_nrf9160_partition.dtsi +++ b/boards/nordic/thingy91/thingy91_nrf9160_partition.dtsi @@ -17,17 +17,18 @@ * 0x000f_e000 Settings storage ( 8 kB) */ partitions { - compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + ranges; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 0xc000>; }; slot0_partition: partition@c000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000c000 0x69000>; ranges = <0x0 0x0000c000 0x69000>; @@ -35,18 +36,20 @@ #size-cells = <1>; slot0_s_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0-secure"; reg = <0x00000000 0xc000>; }; slot0_ns_partition: partition@c000 { + compatible = "zephyr,mapped-partition"; label = "image-0-nonsecure"; reg = <0x0000c000 0x5d000>; }; }; slot1_partition: partition@75000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x00075000 0x69000>; ranges = <0x0 0x00075000 0x69000>; @@ -54,22 +57,26 @@ #size-cells = <1>; slot1_s_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-1-secure"; reg = <0x00000000 0xc000>; }; slot1_ns_partition: partition@c000 { + compatible = "zephyr,mapped-partition"; label = "image-1-nonsecure"; reg = <0x0000c000 0x5d000>; }; }; scratch_partition: partition@de000 { + compatible = "zephyr,mapped-partition"; label = "image-scratch"; reg = <0x000de000 0x1e000>; }; storage_partition: partition@fe000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000fe000 0x2000>; }; diff --git a/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.dts b/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.dts index 9e8f3c91c243..8b9cf292e65f 100644 --- a/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.dts +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.dts @@ -53,26 +53,30 @@ &flash1 { partitions { - compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + ranges; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 0xc000>; }; slot0_partition: partition@c000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000c000 0x17000>; }; slot1_partition: partition@23000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x00023000 0x17000>; }; storage_partition: partition@3a000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x0003a000 0x6000>; }; diff --git a/cmake/extensions.cmake b/cmake/extensions.cmake index 1c8b39009e0d..e7083f7fbce1 100644 --- a/cmake/extensions.cmake +++ b/cmake/extensions.cmake @@ -197,7 +197,7 @@ Please provide one of following: CONF_FILES") set(board_combined ${board_combined}@${BOARD_REVISION}) endif() - set(board_combined ${board_combined}${BOARD_QUALIFIERS}) + set(board_combined ${board_combined}/${BOARD_QUALIFIERS}) parse_board_components(board_combined board_name board_revision board_qualifiers) endif() diff --git a/cmake/hpf.cmake b/cmake/hpf.cmake index ce742a565c74..c154d433512c 100644 --- a/cmake/hpf.cmake +++ b/cmake/hpf.cmake @@ -78,7 +78,10 @@ function(hpf_assembly_generate soc hrt_srcs) ) endforeach() - add_dependencies(asm_gen syscall_list_h_target kobj_types_h_target) + add_dependencies(asm_gen + syscall_list_h_target + kobj_types_h_target + zephyr_generated_headers) endfunction() diff --git a/cmake/sysbuild/bootloader_dts_utils.cmake b/cmake/sysbuild/bootloader_dts_utils.cmake index 6bf44337f82c..32a14685f85d 100644 --- a/cmake/sysbuild/bootloader_dts_utils.cmake +++ b/cmake/sysbuild/bootloader_dts_utils.cmake @@ -84,24 +84,47 @@ function(dt_partition_addr var) dt_reg_addr(dt_partition_offset PATH "${arg_DT_PARTITION_PATH}" TARGET "${arg_DT_PARTITION_TARGET}") + # Read compatible property to adjust the offset and address caluculation for subpartitions. + dt_prop(partition_compat PATH "${arg_DT_PARTITION_PATH}" TARGET "${arg_DT_PARTITION_TARGET}" + PROPERTY compatible) + # The partition parent should be either a fixed-partitions or a fixed-subpartitions node. set(dt_partition_parent "${arg_DT_PARTITION_PATH}") dt_get_parent(dt_partition_parent) - if("${dt_partition_parent}" IN_LIST fixed_subpartitions) + if("${partition_compat}" STREQUAL "zephyr,mapped-partition") + dt_prop(parent_compat PATH "${dt_partition_parent}" TARGET "${arg_DT_PARTITION_TARGET}" + PROPERTY compatible) + # Go up in the tree until the NVM memory controller is reached. + while("${parent_compat}" STREQUAL "zephyr,mapped-partition") + dt_get_parent(dt_partition_parent) + dt_prop(parent_compat PATH "${dt_partition_parent}" TARGET "${arg_DT_PARTITION_TARGET}" + PROPERTY compatible) + endwhile() + elseif("${dt_partition_parent}" IN_LIST fixed_subpartitions) # Get the parent of the subpartition node, which should be a fixed-partitions node. dt_get_parent(dt_partition_parent) elseif(NOT "${dt_partition_parent}" IN_LIST fixed_partitions) - message(FATAL_ERROR "dt_partition_addr: Node is not a partition or subpartition: " + message(FATAL_ERROR "dt_partition_addr: Node is not a (mapped) partition or subpartition: " "${arg_DT_PARTITION_PATH} in target: ${arg_DT_PARTITION_TARGET}") endif() - if(NOT arg_DT_PARTITION_ABSOLUTE) - # A parent of the "fixed-partitions" node should be the memory controller. + if("${partition_compat}" STREQUAL "zephyr,mapped-partition") + if(NOT arg_DT_PARTITION_ABSOLUTE) + # Skip the "partitions" node. + dt_get_parent(dt_partition_parent) + # A grandparent of the upmost "mapped-partition" node should be the memory controller. + dt_reg_addr(mem_ctrl_addr PATH "${dt_partition_parent}" TARGET "${arg_DT_PARTITION_TARGET}") + # Subtract the memory controller base address to get a relative address. + math(EXPR dt_partition_offset "${dt_partition_offset} - ${mem_ctrl_addr}" OUTPUT_FORMAT + HEXADECIMAL) + endif() + elseif(arg_DT_PARTITION_ABSOLUTE) + # A parent of the "fixed-partitions" should be the memory controller. dt_get_parent(dt_partition_parent) # Add the memory controller base address to get an absolute address. dt_reg_addr(parent_addr PATH "${dt_partition_parent}" TARGET "${arg_DT_PARTITION_TARGET}") - math(EXPR dt_partition_offset "${dt_partition_offset} - ${parent_addr}" OUTPUT_FORMAT + math(EXPR dt_partition_offset "${dt_partition_offset} + ${parent_addr}" OUTPUT_FORMAT HEXADECIMAL) endif() diff --git a/cmake/sysbuild/image_signing_extra.cmake b/cmake/sysbuild/image_signing_extra.cmake index a946c8cc2ccf..f9140a1e0214 100644 --- a/cmake/sysbuild/image_signing_extra.cmake +++ b/cmake/sysbuild/image_signing_extra.cmake @@ -14,6 +14,8 @@ if(NOT extra_paths) return() endif() +include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/bootloader_dts_utils.cmake) + function(dt_get_parent node) string(FIND "${${node}}" "/" pos REVERSE) @@ -48,8 +50,10 @@ if(NOT SB_CONFIG_PARTITION_MANAGER) # Construct list of items which are flash/NVM devices which contain partitions dt_comp_path(fixed_partition_nodes TARGET ${DEFAULT_IMAGE} COMPATIBLE fixed-partitions) dt_comp_path(fixed_subpartition_nodes TARGET ${DEFAULT_IMAGE} COMPATIBLE fixed-subpartitions) + dt_comp_path(zephyr_mapped_partition_nodes TARGET ${DEFAULT_IMAGE} COMPATIBLE zephyr,mapped-partition) list(TRANSFORM fixed_partition_nodes REPLACE "/partitions$" "") list(TRANSFORM fixed_subpartition_nodes REPLACE "/partitions(.*)" "") + list(TRANSFORM zephyr_mapped_partition_nodes REPLACE "/partitions(.*)" "") foreach(node ${fixed_subpartition_nodes}) list(FIND fixed_partition_nodes ${node} exist_check) @@ -58,6 +62,14 @@ if(NOT SB_CONFIG_PARTITION_MANAGER) list(APPEND fixed_partition_nodes ${node}) endif() endforeach() + + foreach(node ${zephyr_mapped_partition_nodes}) + list(FIND fixed_partition_nodes ${node} exist_check) + + if(${exist_check} EQUAL "-1") + list(APPEND fixed_partition_nodes ${node}) + endif() + endforeach() endif() # Fetch devicetree details for flash and slot information @@ -174,7 +186,7 @@ if(num_binaries GREATER 0) ) else() dt_nodelabel(slot_flash TARGET ${DEFAULT_IMAGE} NODELABEL "slot${slot_id}_partition" REQUIRED) - dt_reg_addr(slot_address TARGET ${DEFAULT_IMAGE} PATH "${slot_flash}") + dt_partition_addr(slot_address PATH "${slot_flash}" TARGET ${DEFAULT_IMAGE} ABSOLUTE) foreach(partition_node ${fixed_partition_nodes}) if(${slot_flash} MATCHES ${partition_node}/.*$) @@ -182,7 +194,7 @@ if(num_binaries GREATER 0) PROPERTY "compatible" ) - if(${partition_node_compatible} MATCHES "soc-nv-flash") + if("soc-nv-flash" IN_LIST partition_node_compatible) # Internal flash, use offset of 0 set(base_offset 0) else() diff --git a/doc/nrf/libraries/debug/memfault_ncs.rst b/doc/nrf/libraries/debug/memfault_ncs.rst index 6a1f74f9ab21..cc13bed17ef1 100644 --- a/doc/nrf/libraries/debug/memfault_ncs.rst +++ b/doc/nrf/libraries/debug/memfault_ncs.rst @@ -119,7 +119,7 @@ For more details on each option, use ``menuconfig`` or ``guiconfig``, and see th The Memfault shell is enabled by default, using the UART interface. If :ref:`lib_at_host` library and the Memfault module are enabled simultaneously, both will not behave as expected, as they both require the same UART interface. Therefore, it is recommended to enable only one of these at a time. - To disable the Memfault shell, you need to disable the Kconfig options :kconfig:option:`CONFIG_MEMFAULT_SHELL` and :kconfig:option:`CONFIG_MEMFAULT_NRF_SHELL`. + To disable the Memfault shell, you need to disable the Kconfig option :kconfig:option:`CONFIG_MEMFAULT_SHELL`. Configuration options in |NCS| ============================== diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-1.4.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-1.4.0.rst index f45f8c0f93e1..4cc65884d664 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-1.4.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-1.4.0.rst @@ -513,7 +513,9 @@ For a complete list of |NCS| specific commits, run: git log --oneline manifest-rev ^7a3b253ced The current |NCS| release is based on Zephyr v2.4.0. -See the :ref:`Zephyr v2.4.0 release notes ` for the list of changes. +See the `Zephyr v2.4.0 release notes`_ for the list of changes. + +.. _Zephyr v2.4.0 release notes: https://docs.zephyrproject.org/2.4.0/releases/release-notes-2.4.html Additions specific to |NCS| ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-1.4.1.rst b/doc/nrf/releases_and_maturity/releases/release-notes-1.4.1.rst index c3c1042ed7b2..07fffdcdef0e 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-1.4.1.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-1.4.1.rst @@ -85,7 +85,9 @@ For a complete list of |NCS| specific commits, run: git log --oneline manifest-rev ^7a3b253ced The current |NCS| release is based on Zephyr v2.4.0. -See the :ref:`Zephyr v2.4.0 release notes ` for the list of changes. +See the `Zephyr v2.4.0 release notes`_ for the list of changes. + +.. _Zephyr v2.4.0 release notes: https://docs.zephyrproject.org/2.4.0/releases/release-notes-2.4.html Zephyr changes incorporated into |NCS| -------------------------------------- diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-1.6.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-1.6.0.rst index 456eddbdf9a1..bfbe98b915e8 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-1.6.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-1.6.0.rst @@ -487,7 +487,9 @@ For a complete list of |NCS| specific commits, run: git log --oneline manifest-rev ^v2.6.0-rc1 The current |NCS| release is based on Zephyr v2.6.0-rc1. -See the :ref:`zephyr:zephyr_2.6` Release Notes for an overview of the most important changes inherited from upstream Zephyr. +See the `Zephyr v2.6.0 release notes`_ for an overview of the most important changes inherited from upstream Zephyr. + +.. _Zephyr v2.6.0 release notes: https://docs.zephyrproject.org/2.6.0/releases/release-notes-2.6.html Zephyr Workqueue API Migration ------------------------------ diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.2.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.2.0.rst index 718df26d7f55..15bc01b375a2 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-2.2.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-2.2.0.rst @@ -481,7 +481,7 @@ Trusted Firmware-M (TF-M) samples * Added: * :ref:`tfm_psa_test` for validating compliance with Arm PSA Certified requirements. - * :ref:`tfm_regression_test` to run secure and non-secure Trusted Firmware-M (TF-M) regression tests. + * TF-M: Regression tests to run secure and non-secure Trusted Firmware-M (TF-M) regression tests. * :ref:`tfm_psa_template`, providing a template for Arm PSA best practices on nRF devices and enforcing correct transition and usage of the PSA lifecycle states. * :ref:`provisioning_image` sample that provisions the PSA platform root of trust parameters (such as the PSA Implementation ID and lifecycle state) in a manner compatible with Trusted Firmware-M (TF-M). diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.8.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.8.0.rst index b7b9fe3fb646..4200a81bff1a 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-2.8.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-2.8.0.rst @@ -236,7 +236,7 @@ Build and configuration system * Fixed: * An issue with the |NCS| boot banner using ``CMAKE_SOURCE_DIR`` instead of ``APPLICATION_SOURCE_DIR``. - * An issue with :kconfig:option:`CONFIG_MBEDTLS_CFG_FILE` having a prompt which would, in some circumstances, lead to a sticky value if the configuration was changed. + * An issue with ``CONFIG_MBEDTLS_CFG_FILE`` having a prompt which would, in some circumstances, lead to a sticky value if the configuration was changed. * An issue with changes to image configurations in a ``sysbuild.cmake`` file not being applied to variant images. * An issue with signing variables not expanding strings for nRF70 Series devices. diff --git a/doc/nrf/security/tfm/tfm_services.rst b/doc/nrf/security/tfm/tfm_services.rst index b1e1a69d686c..10e20ef2edf8 100644 --- a/doc/nrf/security/tfm/tfm_services.rst +++ b/doc/nrf/security/tfm/tfm_services.rst @@ -166,7 +166,7 @@ It implements the PSA Crypto APIs (`PSA Certified Crypto API 1.4.0`_) and provid To enable the crypto service, set the :kconfig:option:`CONFIG_TFM_PARTITION_CRYPTO` Kconfig option. -You can configure the service directly using the ``CONFIG_TFM_CRYPTO_*`` Kconfig options found in the :file:`zephyr/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules` file. +You can configure the service directly using the ``CONFIG_TFM_CRYPTO_*`` Kconfig options found in the :file:`zephyr/modules/trusted-firmware-m/Kconfig.tfm.crypto` file. However, it is recommended to use the ``CONFIG_PSA_WANT_*`` Kconfig options to enable the required algorithms and key types. These will enable the required ``CONFIG_TFM_CRYPTO_*`` Kconfig options. diff --git a/doc/zephyr/zephyr.doxyfile.in b/doc/zephyr/zephyr.doxyfile.in index 69847ac5288b..aecfa567d7a2 100644 --- a/doc/zephyr/zephyr.doxyfile.in +++ b/doc/zephyr/zephyr.doxyfile.in @@ -296,6 +296,23 @@ ALIASES = "kconfig{1}=\verbatim \1 \endverbatim" \ "atomic_api=As for all atomic APIs, includes a full/sequentially-consistent memory barrier (where applicable)." \ "supervisor=\qualifier supervisor" +# Aliases to help structure the API documentation for "driver ops" +ALIASES += "def_driverbackendgroup{2}=\defgroup \2_backend \1 Driver Backend API ^^\ + \brief This group contains the API type definitions, callback signatures, and other helpers required to implement a \1 driver. ^^\ + \ingroup \2" +ALIASES += "driver_ops{1}=\brief \htmlonly Driver Operations \endhtmlonly \1 driver operations \ + \details This is the driver API structure any \1 driver needs to define. \ + It contains function pointers to the operations the driver implements, \ + as well as any other driver-specific constant data. ^^\ + ^^ \ + Members marked with \driver_ops_mandatory MUST be set by the driver, \ + whereas those marked with \driver_ops_optional are optional. \ + \see DEVICE_DT_INST_DEFINE() \ + \see DEVICE_DT_DEFINE() \ + \see DEVICE_API()" +ALIASES += "driver_ops_mandatory=\htmlonlyREQ\endhtmlonly" +ALIASES += "driver_ops_optional=\htmlonlyOPT\endhtmlonly" + # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources # only. Doxygen will then generate output that is more tailored for C. For # instance, some of the names that are used will be different. The list of all diff --git a/drivers/sdhc/sdhc_semmc.c b/drivers/sdhc/sdhc_semmc.c index 3722edb1495c..9d7dc1457196 100644 --- a/drivers/sdhc/sdhc_semmc.c +++ b/drivers/sdhc/sdhc_semmc.c @@ -335,7 +335,7 @@ static int api_get_host_props(const struct device *dev, props->f_min = FREQUENCY_MIN; props->f_max = FREQUENCY_MAX; - props->host_caps.bus_4_bit_support = 1; + props->bus_4_bit_support = 1; props->host_caps.vol_180_support = 1; return 0; diff --git a/dts/samples/matter/nrf52840_partitions.dtsi b/dts/samples/matter/nrf52840_partitions.dtsi index 6dc456b52aae..965c35f974be 100644 --- a/dts/samples/matter/nrf52840_partitions.dtsi +++ b/dts/samples/matter/nrf52840_partitions.dtsi @@ -11,26 +11,30 @@ &flash0 { partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 DT_SIZE_K(28)>; }; slot0_partition: partition@7000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00007000 DT_SIZE_K(960)>; }; factory_data_partition: partition@f7000 { + compatible = "zephyr,mapped-partition"; label = "factory-data"; reg = <0x000f7000 DT_SIZE_K(4)>; }; storage_partition: partition@f8000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000f8000 DT_SIZE_K(40)>; }; diff --git a/dts/samples/matter/nrf5340_cpuapp_partitions.dtsi b/dts/samples/matter/nrf5340_cpuapp_partitions.dtsi index f00cbabbbfe5..55d8fd975aaf 100644 --- a/dts/samples/matter/nrf5340_cpuapp_partitions.dtsi +++ b/dts/samples/matter/nrf5340_cpuapp_partitions.dtsi @@ -11,26 +11,30 @@ &flash0 { partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 DT_SIZE_K(32)>; }; slot0_partition: partition@8000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00008000 DT_SIZE_K(956)>; }; factory_data_partition: partition@f7000 { + compatible = "zephyr,mapped-partition"; label = "factory-data"; reg = <0x000f7000 DT_SIZE_K(4)>; }; storage_partition: partition@f8000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000f8000 DT_SIZE_K(32)>; }; diff --git a/dts/samples/matter/nrf5340_cpunet_partitions.dtsi b/dts/samples/matter/nrf5340_cpunet_partitions.dtsi index 01484479b428..1369868b446d 100644 --- a/dts/samples/matter/nrf5340_cpunet_partitions.dtsi +++ b/dts/samples/matter/nrf5340_cpunet_partitions.dtsi @@ -12,16 +12,19 @@ &flash1 { partitions { b0n_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "b0n"; reg = <0x0 0x8580>; }; bl_storage: provision_partition: partition@8580 { + compatible = "zephyr,mapped-partition"; label = "b0-provision-data"; reg = <0x8580 0x280>; }; s0_partition: partition@8800 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x8800 DT_SIZE_K(222)>; }; diff --git a/dts/samples/matter/nrf54l10_cpuapp_partitions.dtsi b/dts/samples/matter/nrf54l10_cpuapp_partitions.dtsi index 2be3421c03bf..309da5683fbf 100644 --- a/dts/samples/matter/nrf54l10_cpuapp_partitions.dtsi +++ b/dts/samples/matter/nrf54l10_cpuapp_partitions.dtsi @@ -18,21 +18,25 @@ &cpuapp_rram { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 DT_SIZE_K(52)>; }; slot0_partition: partition@d000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000d000 DT_SIZE_K(916)>; }; factory_data_partition: partition@f2000 { + compatible = "zephyr,mapped-partition"; label = "factory-data"; reg = <0x000f2000 DT_SIZE_K(4)>; }; storage_partition: partition@f3000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000f3000 DT_SIZE_K(40)>; }; diff --git a/dts/samples/matter/nrf54l15_cpuapp_internal_partitions.dtsi b/dts/samples/matter/nrf54l15_cpuapp_internal_partitions.dtsi index 0460dd0449da..c943bf7b4d70 100644 --- a/dts/samples/matter/nrf54l15_cpuapp_internal_partitions.dtsi +++ b/dts/samples/matter/nrf54l15_cpuapp_internal_partitions.dtsi @@ -19,27 +19,32 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 DT_SIZE_K(52)>; }; slot0_partition: partition@d000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000d000 DT_SIZE_K(864)>; }; /* Compression ratio 34.75% */ slot1_partition: partition@e5000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x00e5000 DT_SIZE_K(564)>; }; factory_data_partition: partition@172000 { + compatible = "zephyr,mapped-partition"; label = "factory-data"; reg = <0x00172000 DT_SIZE_K(4)>; }; storage_partition: partition@173000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x00173000 DT_SIZE_K(40)>; }; diff --git a/dts/samples/matter/nrf54l15_cpuapp_ns_partitions.dtsi b/dts/samples/matter/nrf54l15_cpuapp_ns_partitions.dtsi index e35cf7a2f05c..e2ac45d270d0 100644 --- a/dts/samples/matter/nrf54l15_cpuapp_ns_partitions.dtsi +++ b/dts/samples/matter/nrf54l15_cpuapp_ns_partitions.dtsi @@ -37,17 +37,18 @@ reg = <0x0 DT_SIZE_K(1524)>; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(32)>; }; slot0_partition: partition@d000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0xd000 DT_SIZE_K(1396)>; ranges = <0x0 0xd000 DT_SIZE_K(1396)>; @@ -55,28 +56,32 @@ #size-cells = <1>; slot0_s_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0-secure"; reg = <0x0 DT_SIZE_K(128)>; }; slot0_ns_partition: partition@20000 { + compatible = "zephyr,mapped-partition"; label = "image-0-nonsecure"; reg = <0x00020000 DT_SIZE_K(1268)>; }; }; factory_data_partition: partition@16a000 { + compatible = "zephyr,mapped-partition"; label = "factory-data"; reg = <0x0016a000 DT_SIZE_K(4)>; }; storage_partition: partition@16b000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x0016b000 DT_SIZE_K(40)>; }; tfm_storage_partition: partition@175000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; label = "tfm-storage"; reg = <0x175000 DT_SIZE_K(32)>; ranges = <0x0 0x175000 DT_SIZE_K(32)>; @@ -84,16 +89,19 @@ #size-cells = <1>; tfm_its_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "tfm-its"; reg = <0x0 DT_SIZE_K(8)>; }; tfm_otp_partition: partition@2000 { + compatible = "zephyr,mapped-partition"; label = "tfm-otp"; reg = <0x2000 DT_SIZE_K(8)>; }; tfm_ps_partition: partition@4000 { + compatible = "zephyr,mapped-partition"; label = "tfm-ps"; reg = <0x4000 DT_SIZE_K(16)>; }; diff --git a/dts/samples/matter/nrf54l15_cpuapp_partitions.dtsi b/dts/samples/matter/nrf54l15_cpuapp_partitions.dtsi index 3785939c107b..41df13c85af5 100644 --- a/dts/samples/matter/nrf54l15_cpuapp_partitions.dtsi +++ b/dts/samples/matter/nrf54l15_cpuapp_partitions.dtsi @@ -19,21 +19,25 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 DT_SIZE_K(52)>; }; slot0_partition: partition@d000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000d000 DT_SIZE_K(1428)>; }; factory_data_partition: partition@172000 { + compatible = "zephyr,mapped-partition"; label = "factory-data"; reg = <0x00172000 DT_SIZE_K(4)>; }; storage_partition: partition@173000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x00173000 DT_SIZE_K(40)>; }; diff --git a/dts/samples/matter/nrf54lm20_cpuapp_internal_partitions.dtsi b/dts/samples/matter/nrf54lm20_cpuapp_internal_partitions.dtsi index 9a822be2ce23..75df9c61c0f0 100644 --- a/dts/samples/matter/nrf54lm20_cpuapp_internal_partitions.dtsi +++ b/dts/samples/matter/nrf54lm20_cpuapp_internal_partitions.dtsi @@ -18,32 +18,37 @@ reg = <0x0 DT_SIZE_K(2036)>; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 DT_SIZE_K(40)>; }; slot0_partition: partition@a000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000a000 DT_SIZE_K(1176)>; }; /* Compression ratio 34.75% */ slot1_partition: partition@130000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x00130000 DT_SIZE_K(768)>; }; factory_data_partition: partition@1f0000 { + compatible = "zephyr,mapped-partition"; label = "factory-data"; reg = <0x001f0000 DT_SIZE_K(4)>; }; storage_partition: partition@1f1000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x001f1000 DT_SIZE_K(40)>; }; diff --git a/dts/samples/matter/nrf54lm20_cpuapp_partitions.dtsi b/dts/samples/matter/nrf54lm20_cpuapp_partitions.dtsi index 0c9544234ee7..3600b75d133b 100644 --- a/dts/samples/matter/nrf54lm20_cpuapp_partitions.dtsi +++ b/dts/samples/matter/nrf54lm20_cpuapp_partitions.dtsi @@ -19,21 +19,25 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 DT_SIZE_K(52)>; }; slot0_partition: partition@d000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000d000 DT_SIZE_K(1932)>; }; factory_data_partition: partition@1f0000 { + compatible = "zephyr,mapped-partition"; label = "factory-data"; reg = <0x001f0000 DT_SIZE_K(4)>; }; storage_partition: partition@1f1000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x001f1000 DT_SIZE_K(40)>; }; diff --git a/dts/samples/matter/nrf7002_cpuapp_partitions.dtsi b/dts/samples/matter/nrf7002_cpuapp_partitions.dtsi index 326f18ae8531..89d6a00b8d52 100644 --- a/dts/samples/matter/nrf7002_cpuapp_partitions.dtsi +++ b/dts/samples/matter/nrf7002_cpuapp_partitions.dtsi @@ -12,21 +12,25 @@ &flash0 { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 DT_SIZE_K(48)>; }; slot0_partition: partition@c000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000c000 DT_SIZE_K(940)>; }; factory_data_partition: partition@f7000 { + compatible = "zephyr,mapped-partition"; label = "factory-data"; reg = <0x000f7000 DT_SIZE_K(4)>; }; storage_partition: partition@f8000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000f8000 DT_SIZE_K(32)>; }; diff --git a/include/flash_map_pm.h b/include/flash_map_pm.h index a0f8ed23032b..5708a2aa4d44 100644 --- a/include/flash_map_pm.h +++ b/include/flash_map_pm.h @@ -50,40 +50,50 @@ #define FLASH_AREA_LABEL_STR(label) #label #define FIXED_PARTITION_ID(label) PM_ID(label) +#define PARTITION_ID(label) FIXED_PARTITION_ID(label) #define FLASH_AREA_ID(label) FIXED_PARTITION_ID(label) #define FIXED_PARTITION_DATA_FIELD(label, x) \ UTIL_CAT(PM_, UTIL_CAT(UTIL_CAT(PM_, UTIL_CAT(PM_ID(label), _LABEL)), x)) +#define PARTITION_DATA_FIELD(label, x) FIXED_PARTITION_DATA_FIELD(label, x) #define FLASH_DATA_FIELD(label, x) FIXED_PARTITION_DATA_FIELD(label, x) #define FIXED_PARTITION_OFFSET(label) FIXED_PARTITION_DATA_FIELD(label, _OFFSET) +#define PARTITION_OFFSET(label) FIXED_PARTITION_OFFSET(label) #define FLASH_AREA_OFFSET(label) FIXED_PARTITION_OFFSET(label) #define FIXED_PARTITION_SIZE(label) FIXED_PARTITION_DATA_FIELD(label, _SIZE) +#define PARTITION_SIZE(label) FIXED_PARTITION_SIZE(label) #define FLASH_AREA_SIZE(label) FIXED_PARTITION_SIZE(label) #define FIXED_PARTITION_DEVICE(label) \ COND_CODE_1(DT_NODE_EXISTS(FIXED_PARTITION_DATA_FIELD(label, _DEV)), \ (DEVICE_DT_GET_OR_NULL(FIXED_PARTITION_DATA_FIELD(label, _DEV))), \ (DEVICE_DT_GET_OR_NULL(DT_NODELABEL(FIXED_PARTITION_DATA_FIELD(label, _DEV))))) +#define PARTITION_DEVICE(label) FIXED_PARTITION_DEVICE(label) #define FLASH_AREA_DEVICE(label) FIXED_PARTITION_DEVICE(label) #define FIXED_PARTITION_MTD(label) \ COND_CODE_1(DT_NODE_EXISTS(FIXED_PARTITION_DATA_FIELD(label, _DEV)), \ (FIXED_PARTITION_DATA_FIELD(label, _DEV)), \ (DT_NODELABEL(FIXED_PARTITION_DATA_FIELD(label, _DEV)))) +#define PARTITION_MTD(label) FIXED_PARTITION_MTD(label) #define FIXED_PARTITION_NODE_MTD(node) \ COND_CODE_1( \ DT_FIXED_SUBPARTITION_EXISTS(node), \ (DT_MTD_FROM_FIXED_SUBPARTITION(node)), \ (DT_MTD_FROM_FIXED_PARTITION(node))) +#define PARTITION_NODE_MTD(node) FIXED_PARTITION_NODE_MTD(node) #define FIXED_PARTITION_EXISTS(label) IS_ENABLED(PM_IS_ENABLED(label)) +#define PARTITION_EXISTS(label) FIXED_PARTITION_EXISTS(label) #define FLASH_AREA_LABEL_EXISTS(label) FIXED_PARTITION_EXISTS(label) #define FIXED_PARTITION_ADDRESS(label) FIXED_PARTITION_DATA_FIELD(label, _ADDRESS) +#define PARTITION_ADDRESS(label) FIXED_PARTITION_ADDRESS(label) #define FIXED_PARTITION(label) \ ((const struct flash_area *)&UTIL_CAT(global_pm_partition_, label)) +#define PARTITION(label) FIXED_PARTITION(label) #define DECLARE_PARTITION(label) \ extern const struct flash_area UTIL_CAT(global_pm_partition_, label) diff --git a/lib/bin/lwm2m_carrier/os/lwm2m_os.c b/lib/bin/lwm2m_carrier/os/lwm2m_os.c index 2102c3eb9201..344c9cd0e8f6 100644 --- a/lib/bin/lwm2m_carrier/os/lwm2m_os.c +++ b/lib/bin/lwm2m_carrier/os/lwm2m_os.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/fprotect/sys_init_fprotect.c b/lib/fprotect/sys_init_fprotect.c index 5c6b90cf608f..ae7a89fe0fa8 100644 --- a/lib/fprotect/sys_init_fprotect.c +++ b/lib/fprotect/sys_init_fprotect.c @@ -16,8 +16,8 @@ #define AREA_SIZE PM_SIZE #else #define CODE_PARTITION DT_CHOSEN(zephyr_code_partition) -#define AREA_ADDRESS FIXED_PARTITION_NODE_OFFSET(CODE_PARTITION) -#define AREA_SIZE FIXED_PARTITION_NODE_SIZE(CODE_PARTITION) +#define AREA_ADDRESS PARTITION_NODE_OFFSET(CODE_PARTITION) +#define AREA_SIZE PARTITION_NODE_SIZE(CODE_PARTITION) #endif #define PRIORITY_LEVEL 0 /* Locking should be performed as soon as possible */ diff --git a/lib/hw_unique_key/hw_unique_key_cc3xx_acl.c b/lib/hw_unique_key/hw_unique_key_cc3xx_acl.c index 86caa6383535..5d73036f3e3f 100644 --- a/lib/hw_unique_key/hw_unique_key_cc3xx_acl.c +++ b/lib/hw_unique_key/hw_unique_key_cc3xx_acl.c @@ -29,7 +29,7 @@ static const uint32_t huk_magic[4] = { #ifdef CONFIG_PARTITION_MANAGER_ENABLED static uint32_t huk_addr = PM_HW_UNIQUE_KEY_PARTITION_ADDRESS; #else -static uint32_t huk_addr = FIXED_PARTITION_ADDRESS(hw_unique_key_partition); +static uint32_t huk_addr = PARTITION_ADDRESS(hw_unique_key_partition); #endif int hw_unique_key_write(enum hw_unique_key_slot key_slot, const uint8_t *key) diff --git a/lib/lte_link_control/modules/dns.c b/lib/lte_link_control/modules/dns.c index 338337f7b9d8..8c6ecc24d023 100644 --- a/lib/lte_link_control/modules/dns.c +++ b/lib/lte_link_control/modules/dns.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/lib/nrf_modem_lib/trace_backends/flash/flash.c b/lib/nrf_modem_lib/trace_backends/flash/flash.c index 969b525039e2..ba045f03fdf0 100644 --- a/lib/nrf_modem_lib/trace_backends/flash/flash.c +++ b/lib/nrf_modem_lib/trace_backends/flash/flash.c @@ -221,7 +221,7 @@ int trace_backend_init(trace_backend_processed_cb trace_processed_cb) trace_processed_callback = trace_processed_cb; - err = flash_area_open(FIXED_PARTITION_ID(MODEM_TRACE_PARTITION), &modem_trace_area); + err = flash_area_open(PARTITION_ID(MODEM_TRACE_PARTITION), &modem_trace_area); if (err) { LOG_ERR("flash_area_open error: %d", err); return -ENODEV; @@ -258,7 +258,7 @@ int trace_backend_init(trace_backend_processed_cb trace_processed_cb) uint32_t f_sector_cnt = sizeof(trace_flash_sectors) / sizeof(struct flash_sector); err = flash_area_get_sectors( - FIXED_PARTITION_ID(MODEM_TRACE_PARTITION), &f_sector_cnt, trace_flash_sectors); + PARTITION_ID(MODEM_TRACE_PARTITION), &f_sector_cnt, trace_flash_sectors); if (err) { LOG_ERR("flash_area_get_sectors error: %d", err); @@ -275,7 +275,7 @@ int trace_backend_init(trace_backend_processed_cb trace_processed_cb) LOG_DBG("Sectors: %d, first sector: %p, sector size: %d", f_sector_cnt, trace_flash_sectors, trace_flash_sectors[0].fs_size); - err = fcb_init(FIXED_PARTITION_ID(MODEM_TRACE_PARTITION), &trace_fcb); + err = fcb_init(PARTITION_ID(MODEM_TRACE_PARTITION), &trace_fcb); if (err) { LOG_ERR("fcb_init error: %d", err); return err; diff --git a/lib/ram_pwrdn/Kconfig b/lib/ram_pwrdn/Kconfig index 59fd557b4913..d1b7a9672833 100644 --- a/lib/ram_pwrdn/Kconfig +++ b/lib/ram_pwrdn/Kconfig @@ -22,17 +22,6 @@ menuconfig RAM_POWER_DOWN_LIBRARY if RAM_POWER_DOWN_LIBRARY -config RAM_POWER_ADJUST_ON_HEAP_RESIZE - bool "Automatically adjust RAM power mask on libc heap resize" - depends on NEWLIB_LIBC && !NEWLIB_LIBC_NANO - select NEWLIB_LIBC_HEAP_LISTENER - select EXPERIMENTAL - help - When this option is enabled, the RAM sections not used by the application - image will get automatically disabled at boot time, and then RAM power - configuration will be adjusted when the libc heap (which uses the memory - area following the application image) is increased or trimmed. - module = RAM_POWERDOWN module-str = RAM power-down library source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/lib/ram_pwrdn/ram_pwrdn.c b/lib/ram_pwrdn/ram_pwrdn.c index 89827fd34c3f..fe007986b6d6 100644 --- a/lib/ram_pwrdn/ram_pwrdn.c +++ b/lib/ram_pwrdn/ram_pwrdn.c @@ -19,11 +19,6 @@ #error "RAM power-down library is not supported on the current platform" #endif -#if CONFIG_RAM_POWER_ADJUST_ON_HEAP_RESIZE -#include -#include -#endif - #if defined(CONFIG_PARTITION_MANAGER_ENABLED) #include #endif @@ -225,31 +220,3 @@ void power_up_unused_ram(void) { power_up_ram(RAM_IMAGE_END_ADDR, ram_end_addr()); } - -#if CONFIG_RAM_POWER_ADJUST_ON_HEAP_RESIZE - -static void libc_heap_resize_cb(uintptr_t heap_id, void *old_heap_end, void *new_heap_end) -{ - ARG_UNUSED(heap_id); - - if (new_heap_end > old_heap_end) { - power_up_ram(RAM_IMAGE_END_ADDR, (uintptr_t)new_heap_end); - } else if (new_heap_end < old_heap_end) { - power_down_ram((uintptr_t)new_heap_end, ram_end_addr()); - } -} - -static HEAP_LISTENER_RESIZE_DEFINE(heap_listener, HEAP_ID_LIBC, libc_heap_resize_cb); - -static int ram_power_init(void) -{ - - power_down_unused_ram(); - heap_listener_register(&heap_listener); - - return 0; -} - -SYS_INIT(ram_power_init, APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); - -#endif diff --git a/modules/mcuboot/hooks/nrf53_hooks.c b/modules/mcuboot/hooks/nrf53_hooks.c index c187f85b26c4..8725862a6559 100644 --- a/modules/mcuboot/hooks/nrf53_hooks.c +++ b/modules/mcuboot/hooks/nrf53_hooks.c @@ -149,7 +149,7 @@ int network_core_update(bool wait) return -ENODEV; } - mock_flash = flash_simulator_get_memory(NULL, &mock_size); + mock_flash = flash_simulator_get_memory(mock_flash_dev, &mock_size); hdr = (struct image_header *) mock_flash; if (hdr->ih_magic == IMAGE_MAGIC) { uint32_t fw_size = hdr->ih_img_size; diff --git a/modules/memfault-firmware-sdk/memfault_flash_coredump_storage.c b/modules/memfault-firmware-sdk/memfault_flash_coredump_storage.c index 19741a8754c2..99f626c2e344 100644 --- a/modules/memfault-firmware-sdk/memfault_flash_coredump_storage.c +++ b/modules/memfault-firmware-sdk/memfault_flash_coredump_storage.c @@ -30,7 +30,7 @@ static bool last_coredump_cleared; void memfault_platform_coredump_storage_get_info(sMfltCoredumpStorageInfo *info) { *info = (sMfltCoredumpStorageInfo) { - .size = FIXED_PARTITION_SIZE(MEMFAULT_STORAGE), + .size = PARTITION_SIZE(MEMFAULT_STORAGE), }; } @@ -53,7 +53,7 @@ bool memfault_platform_coredump_storage_read(uint32_t offset, void *data, size_t } /* Note: internal flash is memory mapped so we can just memcpy it out */ - const uint32_t address = FIXED_PARTITION_OFFSET(MEMFAULT_STORAGE) + offset; + const uint32_t address = PARTITION_OFFSET(MEMFAULT_STORAGE) + offset; memcpy(data, (void *)address, read_len); return true; @@ -75,7 +75,7 @@ bool memfault_platform_coredump_storage_erase(uint32_t offset, size_t erase_size } for (size_t page = offset; page < erase_size; page += page_size) { - const uint32_t address = FIXED_PARTITION_OFFSET(MEMFAULT_STORAGE) + page; + const uint32_t address = PARTITION_OFFSET(MEMFAULT_STORAGE) + page; nrfx_nvmc_page_erase(address); } @@ -88,7 +88,7 @@ bool memfault_platform_coredump_storage_erase(uint32_t offset, size_t erase_size */ bool memfault_platform_coredump_storage_buffered_write(sCoredumpWorkingBuffer *blk) { - const uint32_t start_addr = FIXED_PARTITION_OFFSET(MEMFAULT_STORAGE); + const uint32_t start_addr = PARTITION_OFFSET(MEMFAULT_STORAGE); const uint32_t addr = start_addr + blk->write_offset; if (!prv_op_within_flash_bounds(blk->write_offset, MEMFAULT_COREDUMP_STORAGE_WRITE_SIZE)) { @@ -122,7 +122,7 @@ void memfault_platform_coredump_storage_clear(void) const struct flash_area *flash_area; int err; - err = flash_area_open(FIXED_PARTITION_ID(MEMFAULT_STORAGE), &flash_area); + err = flash_area_open(PARTITION_ID(MEMFAULT_STORAGE), &flash_area); if (err) { MEMFAULT_LOG_ERROR("Unable to open coredump storage: 0x%x", err); return; diff --git a/modules/openthread/platform/CMakeLists.txt b/modules/openthread/platform/CMakeLists.txt index 4cd70dad69bc..1554d3bf223b 100644 --- a/modules/openthread/platform/CMakeLists.txt +++ b/modules/openthread/platform/CMakeLists.txt @@ -7,7 +7,8 @@ zephyr_library_sources_ifdef(CONFIG_OPENTHREAD_CRYPTO_PSA crypto_psa.c) # Source platform files from Zephyr zephyr_library_sources( - ${ZEPHYR_BASE}/modules/openthread/platform/alarm.c + ${ZEPHYR_BASE}/modules/openthread/platform/alarm_micro.c + ${ZEPHYR_BASE}/modules/openthread/platform/alarm_milli.c ${ZEPHYR_BASE}/modules/openthread/platform/entropy.c ${ZEPHYR_BASE}/modules/openthread/platform/misc.c ${ZEPHYR_BASE}/modules/openthread/platform/platform.c diff --git a/modules/trusted-firmware-m/Kconfig b/modules/trusted-firmware-m/Kconfig index d8dc8f147f15..ae97342a56be 100644 --- a/modules/trusted-firmware-m/Kconfig +++ b/modules/trusted-firmware-m/Kconfig @@ -17,14 +17,15 @@ rsource "Kconfig.tfm.defconfig" source "$(ZEPHYR_BASE)/modules/trusted-firmware-m/Kconfig.tfm" +if BUILD_WITH_TFM + if !TFM_PROFILE_TYPE_MINIMAL # When enabling full TFM support, then partitions and crypto modules shall be available. -source "$(ZEPHYR_BASE)/modules/trusted-firmware-m/Kconfig.tfm.partitions" -rsource "Kconfig.tfm.crypto_modules" +rsource "$(ZEPHYR_BASE)/modules/trusted-firmware-m/Kconfig.tfm.partitions" +rsource "$(ZEPHYR_BASE)/modules/trusted-firmware-m/Kconfig.tfm.ps" +rsource "Kconfig.tfm.crypto" endif -if BUILD_WITH_TFM - config TFM_MCUBOOT_HEADER_SIZE hex "MCUboot header size for the TF-M combined slot" default 0x800 if BOOTLOADER_MCUBOOT && SOC_SERIES_NRF54L @@ -114,7 +115,6 @@ config TFM_CRYPTO_IOVEC_BUFFER_SIZE int prompt "TF-M Crypto - PSA FF IO vector buffer size" if !TFM_PROFILE_TYPE_MINIMAL default 1024 if TFM_PROFILE_TYPE_MINIMAL - default 16384 if TFM_REGRESSION_S || TFM_REGRESSION_NS default 8192 if TFM_PARTITION_PROTECTED_STORAGE && TFM_PS_MAX_ASSET_SIZE > 2048 default 5120 help @@ -257,12 +257,6 @@ config TFM_PS_RAM_FS Enable emulated RAM FS for platforms that don't have flash for Protected Storage partition -config TFM_PS_ROLLBACK_PROTECTION - bool "Rollback protection" - default y - help - Enable rollback protection for Protected Storage partition - config TFM_PS_VALIDATE_METADATA_FROM_FLASH bool "Validate filesystem metadata" default y @@ -332,7 +326,6 @@ choice TFM_PROFILE_TYPE config TFM_PROFILE_TYPE_MINIMAL bool "TF-M build profile: minimal" - select PSA_DEFAULT_OFF select PSA_WANT_GENERATE_RANDOM select PSA_WANT_ALG_HMAC_DRBG help diff --git a/modules/trusted-firmware-m/Kconfig.mbedtls.defconfig b/modules/trusted-firmware-m/Kconfig.mbedtls.defconfig deleted file mode 100644 index 19c60371ca2a..000000000000 --- a/modules/trusted-firmware-m/Kconfig.mbedtls.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Upstream regression test are not compatible with SHA1, so default to n for -# regression tests. -config MBEDTLS_SHA1_C - default n if TFM_REGRESSION_NS || TFM_REGRESSION_S diff --git a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules b/modules/trusted-firmware-m/Kconfig.tfm.crypto similarity index 98% rename from modules/trusted-firmware-m/Kconfig.tfm.crypto_modules rename to modules/trusted-firmware-m/Kconfig.tfm.crypto index 992c06878ac2..2f9aa8ef425d 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules +++ b/modules/trusted-firmware-m/Kconfig.tfm.crypto @@ -22,4 +22,4 @@ config TFM_CRYPTO_KEY_WRAPPING_MODULE_ENABLED endif # TFM_PARTITION_CRYPTO && (PSA_CRYPTO_DRIVER_OBERON || PSA_CRYPTO_DRIVER_CRACEN) -source "$(ZEPHYR_BASE)/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules" +source "$(ZEPHYR_BASE)/modules/trusted-firmware-m/Kconfig.tfm.crypto" diff --git a/modules/trusted-firmware-m/Kconfig.tfm.defconfig b/modules/trusted-firmware-m/Kconfig.tfm.defconfig index f5e490664017..23bd0fab6e59 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm.defconfig +++ b/modules/trusted-firmware-m/Kconfig.tfm.defconfig @@ -28,11 +28,6 @@ config TFM_DUMMY_PROVISIONING bool default n -config TFM_REGRESSION_NS - bool - select NRF_TIMER0_SECURE if !NRF_PLATFORM_LUMOS - select NRF_TIMER00_SECURE if NRF_PLATFORM_LUMOS - config TFM_LOG_LEVEL_SILENCE # Overrule zephyr disable TF-M secure output if the uart1 node has not # assigned GPIO pins using pinctrl. diff --git a/modules/trusted-firmware-m/Kconfig.tfm.pm b/modules/trusted-firmware-m/Kconfig.tfm.pm index 892b3e08e9f0..acd35a1a6bca 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm.pm +++ b/modules/trusted-firmware-m/Kconfig.tfm.pm @@ -10,7 +10,6 @@ config PM_PARTITION_SIZE_TFM_SRAM hex prompt "Memory reserved for TFM_RAM" if !TFM_PROFILE_TYPE_MINIMAL default 0x8000 if TFM_PROFILE_TYPE_MINIMAL - default 0x18000 if SOC_SERIES_NRF91 && TFM_REGRESSION_S # It has been observed for 54L that when Matter is enabled, then # assigning 0x16000 of RAM to TFM will not leave enough RAM for # Matter. So we use 0x13000 of RAM on 54L. @@ -38,8 +37,6 @@ config PM_PARTITION_SIZE_TFM (SOC_NRF54L15_CPUAPP || SOC_NRF7120_ENGA_CPUAPP) default 0x7E00 if TFM_PROFILE_TYPE_MINIMAL && BOOTLOADER_MCUBOOT default 0x8000 if TFM_PROFILE_TYPE_MINIMAL - # NCSDK-13503: Temporarily bump size while regressions are being fixed - default 0x60000 if TFM_REGRESSION_S default 0x4FE00 if TFM_CMAKE_BUILD_TYPE_DEBUG && BOOTLOADER_MCUBOOT default 0x50000 if TFM_CMAKE_BUILD_TYPE_DEBUG default 0x3F800 if BOOTLOADER_MCUBOOT && (SOC_SERIES_NRF54L || SOC_NRF7120_ENGA_CPUAPP) diff --git a/modules/trusted-firmware-m/tfm_boards/external_core.cmake b/modules/trusted-firmware-m/tfm_boards/external_core.cmake index 6fc7f41c6aa9..ba437c664648 100644 --- a/modules/trusted-firmware-m/tfm_boards/external_core.cmake +++ b/modules/trusted-firmware-m/tfm_boards/external_core.cmake @@ -28,7 +28,7 @@ if(TARGET tfm_api_ns) endif() # Duplicates that can be removed -#set(TFM_MBEDCRYPTO_CONFIG_PATH ${MBEDTLS_CFG_FILE}) +#set(TFM_MBEDCRYPTO_CONFIG_PATH ${MBEDTLS_CONFIG_FILE}) #set(TFM_MBEDCRYPTO_PSA_CRYPTO_CONFIG_PATH ${MBEDTLS_PSA_CRYPTO_CONFIG_FILE}) #set(TFM_MBEDCRYPTO_PSA_CRYPTO_USER_CONFIG_PATH ${MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE}) diff --git a/samples/benchmarks/coremark/boards/nrf7120dk_nrf7120_cpuapp.overlay b/samples/benchmarks/coremark/boards/nrf7120dk_nrf7120_cpuapp.overlay index a92c21576412..013413f01157 100644 --- a/samples/benchmarks/coremark/boards/nrf7120dk_nrf7120_cpuapp.overlay +++ b/samples/benchmarks/coremark/boards/nrf7120dk_nrf7120_cpuapp.overlay @@ -21,11 +21,12 @@ &cpuflpr_mram { partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; cpuflpr_code_partition: partition@0 { + compatible = "zephyr,mapped-partition"; reg = <0x0 DT_SIZE_K(116)>; }; }; diff --git a/samples/bluetooth/fast_pair/input_device/boards/nrf52840dk_nrf52840.overlay b/samples/bluetooth/fast_pair/input_device/boards/nrf52840dk_nrf52840.overlay index 4ad7076d03f3..a734eb9004b8 100644 --- a/samples/bluetooth/fast_pair/input_device/boards/nrf52840dk_nrf52840.overlay +++ b/samples/bluetooth/fast_pair/input_device/boards/nrf52840dk_nrf52840.overlay @@ -9,20 +9,23 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(1000)>; }; bt_fast_pair_partition: partition@fa000 { + compatible = "zephyr,mapped-partition"; reg = <0xfa000 DT_SIZE_K(4)>; }; storage_partition: partition@fb000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0xfb000 DT_SIZE_K(20)>; }; diff --git a/samples/bluetooth/fast_pair/input_device/boards/nrf52dk_nrf52832.overlay b/samples/bluetooth/fast_pair/input_device/boards/nrf52dk_nrf52832.overlay index fdad15fdcc87..dfd7c9684241 100644 --- a/samples/bluetooth/fast_pair/input_device/boards/nrf52dk_nrf52832.overlay +++ b/samples/bluetooth/fast_pair/input_device/boards/nrf52dk_nrf52832.overlay @@ -9,20 +9,23 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(488)>; }; bt_fast_pair_partition: partition@7a000 { + compatible = "zephyr,mapped-partition"; reg = <0x7a000 DT_SIZE_K(4)>; }; storage_partition: partition@7b000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x7b000 DT_SIZE_K(20)>; }; diff --git a/samples/bluetooth/fast_pair/input_device/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/bluetooth/fast_pair/input_device/boards/nrf5340dk_nrf5340_cpuapp.overlay index 4ad7076d03f3..a734eb9004b8 100644 --- a/samples/bluetooth/fast_pair/input_device/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/input_device/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -9,20 +9,23 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(1000)>; }; bt_fast_pair_partition: partition@fa000 { + compatible = "zephyr,mapped-partition"; reg = <0xfa000 DT_SIZE_K(4)>; }; storage_partition: partition@fb000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0xfb000 DT_SIZE_K(20)>; }; diff --git a/samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 5c691bc35bd9..3c5d64b5871a 100644 --- a/samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -9,6 +9,7 @@ partitions { /* Align the partition size to 4096 B to avoid gaps. */ bt_fast_pair_partition: partition@1b0000 { + compatible = "zephyr,mapped-partition"; reg = <0x1b0000 DT_SIZE_K(4)>; }; }; diff --git a/samples/bluetooth/fast_pair/input_device/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/samples/bluetooth/fast_pair/input_device/boards/nrf54l15dk_nrf54l05_cpuapp.overlay index 3cb75ec09d62..fd05a0b2f95a 100644 --- a/samples/bluetooth/fast_pair/input_device/boards/nrf54l15dk_nrf54l05_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/input_device/boards/nrf54l15dk_nrf54l05_cpuapp.overlay @@ -12,20 +12,23 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(476)>; }; bt_fast_pair_partition: partition@77000 { + compatible = "zephyr,mapped-partition"; reg = <0x77000 DT_SIZE_K(4)>; }; storage_partition: partition@78000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x78000 DT_SIZE_K(20)>; }; diff --git a/samples/bluetooth/fast_pair/input_device/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/bluetooth/fast_pair/input_device/boards/nrf54l15dk_nrf54l10_cpuapp.overlay index 7b3ba79c6d7c..47461642666a 100644 --- a/samples/bluetooth/fast_pair/input_device/boards/nrf54l15dk_nrf54l10_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/input_device/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -12,20 +12,23 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(988)>; }; bt_fast_pair_partition: partition@f7000 { + compatible = "zephyr,mapped-partition"; reg = <0xf7000 DT_SIZE_K(4)>; }; storage_partition: partition@f8000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0xf8000 DT_SIZE_K(20)>; }; diff --git a/samples/bluetooth/fast_pair/input_device/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/bluetooth/fast_pair/input_device/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 842428ef22d0..610f1b1ef095 100644 --- a/samples/bluetooth/fast_pair/input_device/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/input_device/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -12,20 +12,23 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(1500)>; }; bt_fast_pair_partition: partition@177000 { + compatible = "zephyr,mapped-partition"; reg = <0x177000 DT_SIZE_K(4)>; }; storage_partition: partition@178000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x178000 DT_SIZE_K(20)>; }; diff --git a/samples/bluetooth/fast_pair/input_device/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/samples/bluetooth/fast_pair/input_device/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 0b6770e2b351..ec3e5df7ab06 100644 --- a/samples/bluetooth/fast_pair/input_device/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/input_device/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -12,20 +12,23 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(2012)>; }; bt_fast_pair_partition: partition@1f7000 { + compatible = "zephyr,mapped-partition"; reg = <0x1f7000 DT_SIZE_K(4)>; }; storage_partition: partition@1f8000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x1f8000 DT_SIZE_K(20)>; }; diff --git a/samples/bluetooth/fast_pair/input_device/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay b/samples/bluetooth/fast_pair/input_device/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay index 75ab85e54788..f2dbccbd2497 100644 --- a/samples/bluetooth/fast_pair/input_device/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/input_device/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay @@ -9,20 +9,23 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(484)>; }; bt_fast_pair_partition: partition@79000 { + compatible = "zephyr,mapped-partition"; reg = <0x79000 DT_SIZE_K(4)>; }; storage_partition: partition@7a000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x7a000 DT_SIZE_K(20)>; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52833dk_nrf52833.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52833dk_nrf52833.overlay index 63d0bfc4f076..792a76ce65bc 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52833dk_nrf52833.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52833dk_nrf52833.overlay @@ -9,20 +9,23 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(496)>; }; bt_fast_pair_partition: partition@7c000 { + compatible = "zephyr,mapped-partition"; reg = <0x7c000 DT_SIZE_K(4)>; }; storage_partition: partition@7d000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x7d000 DT_SIZE_K(12)>; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52833dk_nrf52833_release.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52833dk_nrf52833_release.overlay index c553eba9216c..fa7da991ab27 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52833dk_nrf52833_release.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52833dk_nrf52833_release.overlay @@ -9,30 +9,35 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(16)>; }; slot0_partition: partition@4000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x4000 DT_SIZE_K(240)>; }; slot1_partition: partition@40000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x40000 DT_SIZE_K(240)>; }; bt_fast_pair_partition: partition@7c000 { + compatible = "zephyr,mapped-partition"; reg = <0x7c000 DT_SIZE_K(4)>; }; storage_partition: partition@7d000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x7d000 DT_SIZE_K(12)>; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52840dk_nrf52840.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52840dk_nrf52840.overlay index dd7b7c6b993b..cd2a8e598e00 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52840dk_nrf52840.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52840dk_nrf52840.overlay @@ -9,30 +9,35 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(16)>; }; slot0_partition: partition@4000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x4000 DT_SIZE_K(496)>; }; slot1_partition: partition@80000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x80000 DT_SIZE_K(496)>; }; bt_fast_pair_partition: partition@fc000 { + compatible = "zephyr,mapped-partition"; reg = <0xfc000 DT_SIZE_K(4)>; }; storage_partition: partition@fd000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0xfd000 DT_SIZE_K(12)>; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52dk_nrf52832.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52dk_nrf52832.overlay index 63d0bfc4f076..792a76ce65bc 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52dk_nrf52832.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52dk_nrf52832.overlay @@ -9,20 +9,23 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(496)>; }; bt_fast_pair_partition: partition@7c000 { + compatible = "zephyr,mapped-partition"; reg = <0x7c000 DT_SIZE_K(4)>; }; storage_partition: partition@7d000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x7d000 DT_SIZE_K(12)>; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52dk_nrf52832_release.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52dk_nrf52832_release.overlay index c553eba9216c..fa7da991ab27 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52dk_nrf52832_release.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52dk_nrf52832_release.overlay @@ -9,30 +9,35 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(16)>; }; slot0_partition: partition@4000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x4000 DT_SIZE_K(240)>; }; slot1_partition: partition@40000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x40000 DT_SIZE_K(240)>; }; bt_fast_pair_partition: partition@7c000 { + compatible = "zephyr,mapped-partition"; reg = <0x7c000 DT_SIZE_K(4)>; }; storage_partition: partition@7d000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x7d000 DT_SIZE_K(12)>; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 935b365b139d..6239b494c618 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -9,6 +9,7 @@ partitions { /* Align the partition size to 4096 B to avoid gaps. */ bt_fast_pair_partition: partition@1b0000 { + compatible = "zephyr,mapped-partition"; reg = <0x1b0000 DT_SIZE_K(4)>; }; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp.overlay index bbf9e69a7612..51faa1ddcf07 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp.overlay @@ -12,20 +12,23 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 DT_SIZE_K(480)>; }; bt_fast_pair_partition: partition@78000 { + compatible = "zephyr,mapped-partition"; reg = <0x78000 DT_SIZE_K(4)>; }; storage_partition: partition@79000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x79000 DT_SIZE_K(16)>; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp_release.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp_release.overlay index 1171f43e9b02..b5fc0535b12a 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp_release.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp_release.overlay @@ -12,30 +12,35 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(24)>; }; slot0_partition: partition@6000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x6000 DT_SIZE_K(228)>; }; slot1_partition: partition@3f000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x3f000 DT_SIZE_K(228)>; }; bt_fast_pair_partition: partition@78000 { + compatible = "zephyr,mapped-partition"; reg = <0x78000 DT_SIZE_K(4)>; }; storage_partition: partition@79000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x79000 DT_SIZE_K(16)>; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l10_cpuapp.overlay index 1d8517aae2cb..6e7a81ec3b87 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l10_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -12,30 +12,35 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(24)>; }; slot0_partition: partition@6000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x6000 DT_SIZE_K(484)>; }; slot1_partition: partition@7f000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x7f000 DT_SIZE_K(484)>; }; bt_fast_pair_partition: partition@f8000 { + compatible = "zephyr,mapped-partition"; reg = <0xf8000 DT_SIZE_K(4)>; }; storage_partition: partition@f9000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0xf9000 DT_SIZE_K(16)>; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 4f73addae5fd..6bc872ccf134 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -12,30 +12,35 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(24)>; }; slot0_partition: partition@6000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x6000 DT_SIZE_K(736)>; }; slot1_partition: partition@be000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0xbe000 DT_SIZE_K(736)>; }; bt_fast_pair_partition: partition@176000 { + compatible = "zephyr,mapped-partition"; reg = <0x176000 DT_SIZE_K(4)>; }; storage_partition: partition@177000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x177000 DT_SIZE_K(24)>; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 0572de932911..73779380aed2 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -12,30 +12,35 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(20)>; }; slot0_partition: partition@5000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x5000 DT_SIZE_K(996)>; }; slot1_partition: partition@fe000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0xfe000 DT_SIZE_K(996)>; }; bt_fast_pair_partition: partition@1f7000 { + compatible = "zephyr,mapped-partition"; reg = <0x1f7000 DT_SIZE_K(4)>; }; storage_partition: partition@1f8000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x1f8000 DT_SIZE_K(20)>; }; diff --git a/samples/bluetooth/mesh/dfu/common/src/dfu_target.c b/samples/bluetooth/mesh/dfu/common/src/dfu_target.c index a672b8e8d98b..8e79dae827fb 100644 --- a/samples/bluetooth/mesh/dfu/common/src/dfu_target.c +++ b/samples/bluetooth/mesh/dfu/common/src/dfu_target.c @@ -133,8 +133,8 @@ static int dfu_meta_check(struct bt_mesh_dfu_srv *srv, return -EINVAL; } - if (flash_area_size_get(FIXED_PARTITION_ID(slot0_partition)) < metadata.fw_size || - flash_area_size_get(FIXED_PARTITION_ID(slot1_partition)) < metadata.fw_size) { + if (flash_area_size_get(PARTITION_ID(slot0_partition)) < metadata.fw_size || + flash_area_size_get(PARTITION_ID(slot1_partition)) < metadata.fw_size) { printk("New firmware won't fit into flash."); return -EINVAL; } @@ -251,7 +251,7 @@ static void image_version_load(void) struct mcuboot_img_header img_header; int err; - err = boot_read_bank_header(FIXED_PARTITION_ID(slot0_partition), &img_header, + err = boot_read_bank_header(PARTITION_ID(slot0_partition), &img_header, sizeof(img_header)); if (err) { printk("Failed to read image header: %d\n", err); diff --git a/samples/bluetooth/mesh/dfu/distributor/prj.conf b/samples/bluetooth/mesh/dfu/distributor/prj.conf index 69b6a97b716f..c3a05bfc7778 100644 --- a/samples/bluetooth/mesh/dfu/distributor/prj.conf +++ b/samples/bluetooth/mesh/dfu/distributor/prj.conf @@ -110,6 +110,7 @@ CONFIG_SEGGER_RTT_BUFFER_SIZE_DOWN=100 # MCUmgr UART transport CONFIG_BASE64=y +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=y # This option may not be enabled automatically for some boards. Enabling it explicitly to avoid diff --git a/samples/bluetooth/mesh/dfu/distributor/src/main.c b/samples/bluetooth/mesh/dfu/distributor/src/main.c index f98f84b665ce..30a4791386e4 100644 --- a/samples/bluetooth/mesh/dfu/distributor/src/main.c +++ b/samples/bluetooth/mesh/dfu/distributor/src/main.c @@ -147,7 +147,7 @@ int main(void) printk("Initializing...\n"); - err = bt_mesh_blob_io_flash_init(&blob_flash_stream, FIXED_PARTITION_ID(slot1_partition), + err = bt_mesh_blob_io_flash_init(&blob_flash_stream, PARTITION_ID(slot1_partition), 0); if (err) { printk("Failed to init BLOB IO Flash module: %d\n", err); diff --git a/samples/bluetooth/mesh/dfu/distributor/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_dfu_ext_flash.overlay b/samples/bluetooth/mesh/dfu/distributor/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_dfu_ext_flash.overlay index 735564df70da..c439612cd1b8 100644 --- a/samples/bluetooth/mesh/dfu/distributor/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_dfu_ext_flash.overlay +++ b/samples/bluetooth/mesh/dfu/distributor/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_dfu_ext_flash.overlay @@ -16,16 +16,19 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x000000000 0x00014000>; }; slot0_partition: partition@14000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x000014000 0x0015a000>; }; storage_partition: partition@16e000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x16e000 0x9000>; }; diff --git a/samples/bluetooth/mesh/dfu/target/src/main.c b/samples/bluetooth/mesh/dfu/target/src/main.c index ced4f83e8d88..5eeed5e36de4 100644 --- a/samples/bluetooth/mesh/dfu/target/src/main.c +++ b/samples/bluetooth/mesh/dfu/target/src/main.c @@ -138,7 +138,7 @@ int main(void) printk("Initializing...\n"); - err = bt_mesh_blob_io_flash_init(&blob_flash_stream, FIXED_PARTITION_ID(slot1_partition), + err = bt_mesh_blob_io_flash_init(&blob_flash_stream, PARTITION_ID(slot1_partition), 0); if (err) { printk("Failed to init BLOB IO Flash module: %d\n", err); diff --git a/samples/bluetooth/mesh/dfu/target/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_dfu_ext_flash.overlay b/samples/bluetooth/mesh/dfu/target/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_dfu_ext_flash.overlay index 735564df70da..c439612cd1b8 100644 --- a/samples/bluetooth/mesh/dfu/target/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_dfu_ext_flash.overlay +++ b/samples/bluetooth/mesh/dfu/target/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_dfu_ext_flash.overlay @@ -16,16 +16,19 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x000000000 0x00014000>; }; slot0_partition: partition@14000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x000014000 0x0015a000>; }; storage_partition: partition@16e000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x16e000 0x9000>; }; diff --git a/samples/bluetooth/mesh/light/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay b/samples/bluetooth/mesh/light/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay index 49f619a7039a..f822e56c3e9e 100644 --- a/samples/bluetooth/mesh/light/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay +++ b/samples/bluetooth/mesh/light/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay @@ -15,7 +15,7 @@ &flash0 { partitions { slot0_partition: partition@0 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0xe8000>; ranges = <0x0 0x0 0xe8000>; @@ -23,11 +23,13 @@ #size-cells = <1>; slot0_s_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0-secure"; reg = <0x00000000 0x20000>; }; slot0_ns_partition: partition@20000 { + compatible = "zephyr,mapped-partition"; label = "image-0-nonsecure"; reg = <0x00020000 0xc8000>; }; diff --git a/samples/bluetooth/mesh/light/boards/nrf5340dk_nrf5340_cpuapp_ns_dfu.overlay b/samples/bluetooth/mesh/light/boards/nrf5340dk_nrf5340_cpuapp_ns_dfu.overlay index a03cc0b8f23e..efc9016d623a 100644 --- a/samples/bluetooth/mesh/light/boards/nrf5340dk_nrf5340_cpuapp_ns_dfu.overlay +++ b/samples/bluetooth/mesh/light/boards/nrf5340dk_nrf5340_cpuapp_ns_dfu.overlay @@ -16,7 +16,7 @@ &flash0 { partitions { slot0_partition: partition@10000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x10000 0x74000>; ranges = <0x0 0x10000 0x74000>; @@ -24,18 +24,20 @@ #size-cells = <1>; slot0_s_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0-secure"; reg = <0x0 0x30000>; }; slot0_ns_partition: partition@30000 { + compatible = "zephyr,mapped-partition"; label = "image-0-nonsecure"; reg = <0x30000 0x44000>; }; }; slot1_partition: partition@84000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x84000 0x74000>; ranges = <0x0 0x84000 0x74000>; @@ -43,11 +45,13 @@ #size-cells = <1>; slot1_s_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-1-secure"; reg = <0x0 0x30000>; }; slot1_ns_partition: partition@30000 { + compatible = "zephyr,mapped-partition"; label = "image-1-nonsecure"; reg = <0x30000 0x44000>; }; diff --git a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp_dfu.overlay b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp_dfu.overlay index df098c610791..d7eb54bc91ee 100644 --- a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp_dfu.overlay +++ b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp_dfu.overlay @@ -12,21 +12,25 @@ &cpuapp_rram { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 0xe000>; }; slot0_partition: partition@e000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0xe000 0x73000>; }; slot1_partition: partition@81000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x81000 0x73000>; }; storage_partition: partition@f5000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0xf5000 0x8000>; }; diff --git a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp_dfu.overlay b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp_dfu.overlay index eb5120e952ad..79726021cba3 100644 --- a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp_dfu.overlay +++ b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp_dfu.overlay @@ -12,21 +12,25 @@ &cpuapp_rram { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 0xe000>; }; slot0_partition: partition@e000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0xe000 0xa7000>; }; slot1_partition: partition@b5000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0xb5000 0xa7000>; }; storage_partition: partition@15d000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x15d000 0x8000>; }; diff --git a/samples/bluetooth/mesh/light/boards/nrf54lm20dk_nrf54lm20a_cpuapp_dfu.overlay b/samples/bluetooth/mesh/light/boards/nrf54lm20dk_nrf54lm20a_cpuapp_dfu.overlay index e5315f3d9736..05856df74176 100644 --- a/samples/bluetooth/mesh/light/boards/nrf54lm20dk_nrf54lm20a_cpuapp_dfu.overlay +++ b/samples/bluetooth/mesh/light/boards/nrf54lm20dk_nrf54lm20a_cpuapp_dfu.overlay @@ -12,21 +12,25 @@ &cpuapp_rram { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 0xe000>; }; slot0_partition: partition@e000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0xe000 0xe7000>; }; slot1_partition: partition@f5000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0xf5000 0xe7000>; }; storage_partition: partition@1dd000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x1dd000 0x8000>; }; diff --git a/samples/bluetooth/mesh/light/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/bluetooth/mesh/light/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay index dd3492bd193e..aca5d1a061b9 100644 --- a/samples/bluetooth/mesh/light/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay +++ b/samples/bluetooth/mesh/light/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -18,21 +18,25 @@ &cpuapp_rram { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 0xe000>; }; slot0_partition: partition@e000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0xe000 0x73000>; }; slot1_partition: partition@81000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x81000 0x73000>; }; storage_partition: partition@f5000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0xf5000 0x8000>; }; diff --git a/samples/bluetooth/mesh/light/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/bluetooth/mesh/light/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index c96b80d03e4f..92ef0a747562 100644 --- a/samples/bluetooth/mesh/light/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/bluetooth/mesh/light/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -18,21 +18,25 @@ &cpuapp_rram { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 0xe000>; }; slot0_partition: partition@e000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0xe000 0xa7000>; }; slot1_partition: partition@b5000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0xb5000 0xa7000>; }; storage_partition: partition@15d000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x15d000 0x8000>; }; diff --git a/samples/bluetooth/mesh/light/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/samples/bluetooth/mesh/light/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 5139d8823848..c7a7f5ef9e29 100644 --- a/samples/bluetooth/mesh/light/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/samples/bluetooth/mesh/light/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -18,21 +18,25 @@ &cpuapp_rram { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 0xe000>; }; slot0_partition: partition@e000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0xe000 0xe7000>; }; slot1_partition: partition@f5000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0xf5000 0xe7000>; }; storage_partition: partition@1dd000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x1dd000 0x8000>; }; diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf21540dk_nrf52840_emds.overlay b/samples/bluetooth/mesh/light_ctrl/boards/nrf21540dk_nrf52840_emds.overlay index 536e0abe029a..d2e5fa5d7131 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf21540dk_nrf52840_emds.overlay +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf21540dk_nrf52840_emds.overlay @@ -12,21 +12,25 @@ &flash0 { partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x000f0000>; }; storage_partition: partition@f0000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000f0000 0x00008000>; }; emds_partition_0: partition@f8000 { + compatible = "zephyr,mapped-partition"; label = "emds-0"; reg = <0x000f8000 0x00004000>; }; emds_partition_1: partition@fc000 { + compatible = "zephyr,mapped-partition"; label = "emds-1"; reg = <0x000fc000 0x00004000>; }; diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf52833dk_nrf52833_emds.overlay b/samples/bluetooth/mesh/light_ctrl/boards/nrf52833dk_nrf52833_emds.overlay index 200ad4a5f1c0..2d05c05a3a01 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf52833dk_nrf52833_emds.overlay +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf52833dk_nrf52833_emds.overlay @@ -12,21 +12,25 @@ &flash0 { partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x00070000>; }; storage_partition: partition@70000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x00070000 0x00008000>; }; emds_partition_0: partition@78000 { + compatible = "zephyr,mapped-partition"; label = "emds-0"; reg = <0x00078000 0x00004000>; }; emds_partition_1: partition@7c000 { + compatible = "zephyr,mapped-partition"; label = "emds-1"; reg = <0x0007c000 0x00004000>; }; diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf52840dk_nrf52840_emds.overlay b/samples/bluetooth/mesh/light_ctrl/boards/nrf52840dk_nrf52840_emds.overlay index 536e0abe029a..d2e5fa5d7131 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf52840dk_nrf52840_emds.overlay +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf52840dk_nrf52840_emds.overlay @@ -12,21 +12,25 @@ &flash0 { partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x000f0000>; }; storage_partition: partition@f0000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000f0000 0x00008000>; }; emds_partition_0: partition@f8000 { + compatible = "zephyr,mapped-partition"; label = "emds-0"; reg = <0x000f8000 0x00004000>; }; emds_partition_1: partition@fc000 { + compatible = "zephyr,mapped-partition"; label = "emds-1"; reg = <0x000fc000 0x00004000>; }; diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf52840dongle_nrf52840.overlay b/samples/bluetooth/mesh/light_ctrl/boards/nrf52840dongle_nrf52840.overlay index 2b692f3b07dd..c344279905cc 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf52840dongle_nrf52840.overlay +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf52840dongle_nrf52840.overlay @@ -12,11 +12,13 @@ &flash0 { partitions { slot0_partition: partition@1000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00001000 0x000d7000>; }; storage_partition: partition@d8000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000d8000 0x00008000>; }; diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf5340dk_nrf5340_cpuapp_emds.overlay b/samples/bluetooth/mesh/light_ctrl/boards/nrf5340dk_nrf5340_cpuapp_emds.overlay index 3db8bb9810f3..57573305a802 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf5340dk_nrf5340_cpuapp_emds.overlay +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf5340dk_nrf5340_cpuapp_emds.overlay @@ -35,21 +35,25 @@ &flash0 { partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x000f0000>; }; storage_partition: partition@f0000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000f0000 0x00008000>; }; emds_partition_0: partition@f8000 { + compatible = "zephyr,mapped-partition"; label = "emds-0"; reg = <0x000f8000 0x00004000>; }; emds_partition_1: partition@fc000 { + compatible = "zephyr,mapped-partition"; label = "emds-1"; reg = <0x000fc000 0x00004000>; }; diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp_emds.overlay b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp_emds.overlay index 437cc5cf4d3b..1eb901f9e222 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp_emds.overlay +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp_emds.overlay @@ -12,21 +12,25 @@ &cpuapp_rram { partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x0006d000>; }; storage_partition: partition@6d000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x0006d000 0x00008000>; }; emds_partition_0: partition@75000 { + compatible = "zephyr,mapped-partition"; label = "emds-0"; reg = <0x00075000 0x00004000>; }; emds_partition_1: partition@79000 { + compatible = "zephyr,mapped-partition"; label = "emds-1"; reg = <0x00079000 0x00004000>; }; diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp_emds.overlay b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp_emds.overlay index f8f834f6a437..1ed94a9d2880 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp_emds.overlay +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp_emds.overlay @@ -12,21 +12,25 @@ &cpuapp_rram { partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x000ed000>; }; storage_partition: partition@ed000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000ed000 0x00008000>; }; emds_partition_0: partition@f5000 { + compatible = "zephyr,mapped-partition"; label = "emds-0"; reg = <0x000f5000 0x00004000>; }; emds_partition_1: partition@f9000 { + compatible = "zephyr,mapped-partition"; label = "emds-1"; reg = <0x000f9000 0x00004000>; }; diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp_emds.overlay b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp_emds.overlay index 6c09024aa2b0..3788df5be2e1 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp_emds.overlay +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp_emds.overlay @@ -12,21 +12,25 @@ &cpuapp_rram { partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x00155000>; }; storage_partition: partition@155000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x00155000 0x00008000>; }; emds_partition_0: partition@15d000 { + compatible = "zephyr,mapped-partition"; label = "emds-0"; reg = <0x0015d000 0x00004000>; }; emds_partition_1: partition@161000 { + compatible = "zephyr,mapped-partition"; label = "emds-1"; reg = <0x00161000 0x00004000>; }; diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf54lm20dk_nrf54lm20a_cpuapp_emds.overlay b/samples/bluetooth/mesh/light_ctrl/boards/nrf54lm20dk_nrf54lm20a_cpuapp_emds.overlay index eaadbf828d0a..deafa741ef20 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf54lm20dk_nrf54lm20a_cpuapp_emds.overlay +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf54lm20dk_nrf54lm20a_cpuapp_emds.overlay @@ -12,21 +12,25 @@ &cpuapp_rram { partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x001d5000>; }; storage_partition: partition@1d5000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x001d5000 0x00008000>; }; emds_partition_0: partition@1dd000 { + compatible = "zephyr,mapped-partition"; label = "emds-0"; reg = <0x001dd000 0x00004000>; }; emds_partition_1: partition@1e1000 { + compatible = "zephyr,mapped-partition"; label = "emds-1"; reg = <0x001e1000 0x00004000>; }; diff --git a/samples/bluetooth/mesh/light_dimmer/boards/nrf52840dongle_nrf52840.overlay b/samples/bluetooth/mesh/light_dimmer/boards/nrf52840dongle_nrf52840.overlay index 5de66c15e090..9258c1bf2a05 100644 --- a/samples/bluetooth/mesh/light_dimmer/boards/nrf52840dongle_nrf52840.overlay +++ b/samples/bluetooth/mesh/light_dimmer/boards/nrf52840dongle_nrf52840.overlay @@ -11,11 +11,13 @@ &flash0 { partitions { slot0_partition: partition@1000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00001000 0x000d7000>; }; storage_partition: partition@d8000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000d8000 0x00008000>; }; diff --git a/samples/bluetooth/peripheral_lbs/common/memory_map_tcm.dtsi b/samples/bluetooth/peripheral_lbs/common/memory_map_tcm.dtsi index ab9a78940769..f23cf8a215d5 100644 --- a/samples/bluetooth/peripheral_lbs/common/memory_map_tcm.dtsi +++ b/samples/bluetooth/peripheral_lbs/common/memory_map_tcm.dtsi @@ -30,23 +30,27 @@ /* Primary: loader (MRAM) + ipc_radio image (MRAM, copied to TCM). */ cpurad_slot0_partition: cpurad_loader_partition: partition@92000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loader_partition"; reg = <0x92000 DT_SIZE_K(8)>; }; /* Max size == TCM region (see memory_map_ram_cpurad.dtsi, 192 KiB). */ cpurad_slot2_partition: cpurad_loaded_fw: partition@94000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loaded_fw"; reg = <0x94000 DT_SIZE_K(192)>; }; /* Secondary slot pair (same firmware sizes as primary). */ cpurad_slot1_partition: cpurad_loader_partition_slot1: partition@152000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loader_partition_slot1"; reg = <0x152000 DT_SIZE_K(8)>; }; cpurad_slot3_partition: cpurad_loaded_fw_slot1: partition@154000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loaded_fw_slot1"; reg = <0x154000 DT_SIZE_K(192)>; }; diff --git a/samples/bluetooth/peripheral_power_profiling/common/memory_map_tcm.dtsi b/samples/bluetooth/peripheral_power_profiling/common/memory_map_tcm.dtsi index ab9a78940769..f23cf8a215d5 100644 --- a/samples/bluetooth/peripheral_power_profiling/common/memory_map_tcm.dtsi +++ b/samples/bluetooth/peripheral_power_profiling/common/memory_map_tcm.dtsi @@ -30,23 +30,27 @@ /* Primary: loader (MRAM) + ipc_radio image (MRAM, copied to TCM). */ cpurad_slot0_partition: cpurad_loader_partition: partition@92000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loader_partition"; reg = <0x92000 DT_SIZE_K(8)>; }; /* Max size == TCM region (see memory_map_ram_cpurad.dtsi, 192 KiB). */ cpurad_slot2_partition: cpurad_loaded_fw: partition@94000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loaded_fw"; reg = <0x94000 DT_SIZE_K(192)>; }; /* Secondary slot pair (same firmware sizes as primary). */ cpurad_slot1_partition: cpurad_loader_partition_slot1: partition@152000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loader_partition_slot1"; reg = <0x152000 DT_SIZE_K(8)>; }; cpurad_slot3_partition: cpurad_loaded_fw_slot1: partition@154000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loaded_fw_slot1"; reg = <0x154000 DT_SIZE_K(192)>; }; diff --git a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf index 04524e9ade6b..fec49d91f9c2 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf +++ b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf @@ -4,7 +4,7 @@ CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_MAX_IMG_SECTORS=2048 CONFIG_BOOT_SIGNATURE_TYPE_RSA=y diff --git a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf index c5dbbe685627..e1bbf9b57bee 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf +++ b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf @@ -1,7 +1,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpurad.overlay index 5a9a480171d6..970ebc334837 100644 --- a/samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -103,6 +103,7 @@ * It will likely need to be updated as the MRAM memory map is not yet final. */ cpurad_storage_partition: partition@1e3000 { + compatible = "zephyr,mapped-partition"; reg = <0x1e3000 DT_SIZE_K(24)>; }; }; diff --git a/samples/bootloader/src/main.c b/samples/bootloader/src/main.c index fcb4885c0a2a..f57b2fc60218 100644 --- a/samples/bootloader/src/main.c +++ b/samples/bootloader/src/main.c @@ -66,8 +66,8 @@ static const uint32_t b0_offset = PM_B0_ADDRESS; static const uint32_t b0_size = PM_B0_SIZE; #else -static const uint32_t b0_offset = FIXED_PARTITION_OFFSET(b0_partition); -static const uint32_t b0_size = FIXED_PARTITION_SIZE(b0_partition); +static const uint32_t b0_offset = PARTITION_OFFSET(b0_partition); +static const uint32_t b0_size = PARTITION_SIZE(b0_partition); #endif #endif @@ -83,7 +83,7 @@ static const uint32_t b0_size = FIXED_PARTITION_SIZE(b0_partition); #if USE_PARTITION_MANAGER static const uint32_t huk_flag_addr = PM_HW_UNIQUE_KEY_PARTITION_ADDRESS + HUK_FLAG_OFFSET; #else -static const uint32_t huk_flag_addr = FIXED_PARTITION_ADDRESS(hw_unique_key_partition); +static const uint32_t huk_flag_addr = PARTITION_ADDRESS(hw_unique_key_partition); #endif diff --git a/samples/cellular/fmfu_smp_svr/prj.conf b/samples/cellular/fmfu_smp_svr/prj.conf index fe721b4cc4fe..5b9ef896e0df 100644 --- a/samples/cellular/fmfu_smp_svr/prj.conf +++ b/samples/cellular/fmfu_smp_svr/prj.conf @@ -33,6 +33,7 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_MAIN_STACK_SIZE=2048 # Enable the UART mcumgr transports. +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=y CONFIG_BASE64=y CONFIG_CRC=y diff --git a/samples/cellular/lwm2m_client/overlay-mcumgr_client.conf b/samples/cellular/lwm2m_client/overlay-mcumgr_client.conf index 4d9bc00e0d33..1ba31130ca35 100644 --- a/samples/cellular/lwm2m_client/overlay-mcumgr_client.conf +++ b/samples/cellular/lwm2m_client/overlay-mcumgr_client.conf @@ -21,6 +21,7 @@ CONFIG_MCUMGR_GRP_IMG=y CONFIG_MCUMGR_GRP_OS=y # Enable the serial mcumgr transport. +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=y CONFIG_UART_MCUMGR_RX_BUF_COUNT=4 # Add more recors to SENML CBOR diff --git a/samples/cellular/modem_shell/boards/thingy91_nrf9160_ns.conf b/samples/cellular/modem_shell/boards/thingy91_nrf9160_ns.conf index 6b7643fed0eb..81f38145bbce 100644 --- a/samples/cellular/modem_shell/boards/thingy91_nrf9160_ns.conf +++ b/samples/cellular/modem_shell/boards/thingy91_nrf9160_ns.conf @@ -29,3 +29,6 @@ CONFIG_IMG_MANAGER=y CONFIG_STREAM_FLASH=y CONFIG_MCUBOOT_IMG_MANAGER=y CONFIG_IMG_ERASE_PROGRESSIVELY=y + +# Disable stack trace to free flash +CONFIG_EXTRA_EXCEPTION_INFO=n diff --git a/samples/cellular/nrf_cloud_coap_fota/smp_fota.conf b/samples/cellular/nrf_cloud_coap_fota/smp_fota.conf index 95200b45a972..f04c7c8f6163 100644 --- a/samples/cellular/nrf_cloud_coap_fota/smp_fota.conf +++ b/samples/cellular/nrf_cloud_coap_fota/smp_fota.conf @@ -7,6 +7,7 @@ CONFIG_NRF_CLOUD_FOTA_SMP=y CONFIG_NRF_MCUMGR_SMP_CLIENT=y CONFIG_MCUMGR_GRP_IMG=y CONFIG_MCUMGR_GRP_OS=y +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=y CONFIG_UART_MCUMGR_RX_BUF_COUNT=4 CONFIG_SMP_CMD_RETRY_TIME=1000 diff --git a/samples/cellular/nrf_cloud_mqtt_fota/smp_fota.conf b/samples/cellular/nrf_cloud_mqtt_fota/smp_fota.conf index 65915aa6815d..17df315b129e 100644 --- a/samples/cellular/nrf_cloud_mqtt_fota/smp_fota.conf +++ b/samples/cellular/nrf_cloud_mqtt_fota/smp_fota.conf @@ -7,6 +7,7 @@ CONFIG_NRF_CLOUD_FOTA_SMP=y CONFIG_NRF_MCUMGR_SMP_CLIENT=y CONFIG_MCUMGR_GRP_IMG=y CONFIG_MCUMGR_GRP_OS=y +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=y CONFIG_UART_MCUMGR_RX_BUF_COUNT=4 CONFIG_SMP_CMD_RETRY_TIME=1000 diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf index c5dbbe685627..e1bbf9b57bee 100644 --- a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf @@ -1,7 +1,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/cellular/nrf_cloud_rest_fota/overlay_smp_fota.conf b/samples/cellular/nrf_cloud_rest_fota/overlay_smp_fota.conf index 74333cf5a4b2..8dd7b6419053 100644 --- a/samples/cellular/nrf_cloud_rest_fota/overlay_smp_fota.conf +++ b/samples/cellular/nrf_cloud_rest_fota/overlay_smp_fota.conf @@ -7,6 +7,7 @@ CONFIG_NRF_CLOUD_FOTA_SMP=y CONFIG_NRF_MCUMGR_SMP_CLIENT=y CONFIG_MCUMGR_GRP_IMG=y CONFIG_MCUMGR_GRP_OS=y +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=y CONFIG_UART_MCUMGR_RX_BUF_COUNT=4 CONFIG_SMP_CMD_RETRY_TIME=1000 diff --git a/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf b/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf index 5cc038edffe3..0dd40854b7fb 100644 --- a/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf @@ -1,7 +1,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/cellular/smp_svr/overlay-serial.conf b/samples/cellular/smp_svr/overlay-serial.conf index 24f8118dc9c1..14a60c9f2491 100644 --- a/samples/cellular/smp_svr/overlay-serial.conf +++ b/samples/cellular/smp_svr/overlay-serial.conf @@ -11,6 +11,7 @@ CONFIG_MCUMGR=y # Enable the serial MCUmgr transport. CONFIG_BASE64=y +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=y # Enable most core commands. diff --git a/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf b/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf index 3cf0194ef6e6..a28e41834955 100644 --- a/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf @@ -1,5 +1,5 @@ CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/cellular/tls_ciphersuites/sysbuild/mcuboot/prj.conf b/samples/cellular/tls_ciphersuites/sysbuild/mcuboot/prj.conf index 3d9d7c28f0c4..5575379d0cb0 100644 --- a/samples/cellular/tls_ciphersuites/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/tls_ciphersuites/sysbuild/mcuboot/prj.conf @@ -1,7 +1,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/crypto/hkdf/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/crypto/hkdf/boards/nrf54l15dk_nrf54l05_cpuapp.conf index f76a845a5f5d..fb825d567f3a 100644 --- a/samples/crypto/hkdf/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/crypto/hkdf/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -6,8 +6,6 @@ CONFIG_PSA_CRYPTO_DRIVER_OBERON=n CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y -CONFIG_MBEDTLS_PK_PARSE_C=y - # Mbedtls configuration CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_HEAP_SIZE=8192 diff --git a/samples/crypto/hkdf/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/crypto/hkdf/boards/nrf54l15dk_nrf54l10_cpuapp.conf index f76a845a5f5d..fb825d567f3a 100644 --- a/samples/crypto/hkdf/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/crypto/hkdf/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -6,8 +6,6 @@ CONFIG_PSA_CRYPTO_DRIVER_OBERON=n CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y -CONFIG_MBEDTLS_PK_PARSE_C=y - # Mbedtls configuration CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_HEAP_SIZE=8192 diff --git a/samples/crypto/hkdf/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/crypto/hkdf/boards/nrf54l15dk_nrf54l15_cpuapp.conf index f76a845a5f5d..fb825d567f3a 100644 --- a/samples/crypto/hkdf/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/crypto/hkdf/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -6,8 +6,6 @@ CONFIG_PSA_CRYPTO_DRIVER_OBERON=n CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y -CONFIG_MBEDTLS_PK_PARSE_C=y - # Mbedtls configuration CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_HEAP_SIZE=8192 diff --git a/samples/crypto/hkdf/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/crypto/hkdf/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf index 7f558e86fc40..2645034fc653 100644 --- a/samples/crypto/hkdf/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf +++ b/samples/crypto/hkdf/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf @@ -5,7 +5,5 @@ CONFIG_PSA_CRYPTO_DRIVER_OBERON=n CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y -CONFIG_MBEDTLS_PK_PARSE_C=y - CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_HEAP_SIZE=8192 diff --git a/samples/crypto/hkdf/boards/nrf7120dk_nrf7120_cpuapp.conf b/samples/crypto/hkdf/boards/nrf7120dk_nrf7120_cpuapp.conf index 7bd8a0ed5184..b4ca096bf8df 100644 --- a/samples/crypto/hkdf/boards/nrf7120dk_nrf7120_cpuapp.conf +++ b/samples/crypto/hkdf/boards/nrf7120dk_nrf7120_cpuapp.conf @@ -7,6 +7,5 @@ CONFIG_PSA_CRYPTO_DRIVER_OBERON=n CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y # Configure MbedTLS -CONFIG_MBEDTLS_PK_PARSE_C=y CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_HEAP_SIZE=8192 diff --git a/samples/crypto/persistent_key_usage/boards/nrf52840dk_nrf52840.overlay b/samples/crypto/persistent_key_usage/boards/nrf52840dk_nrf52840.overlay index c7aa72f1024e..b50f0d1373f5 100644 --- a/samples/crypto/persistent_key_usage/boards/nrf52840dk_nrf52840.overlay +++ b/samples/crypto/persistent_key_usage/boards/nrf52840dk_nrf52840.overlay @@ -19,11 +19,13 @@ &flash0 { partitions { storage_partition: partition@fd000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000fd000 0x00002000>; }; hw_unique_key_partition: partition@ff000 { + compatible = "zephyr,mapped-partition"; label = ""; reg = <0x000ff000 0x00001000>; }; diff --git a/samples/dect/dect_phy/dect_shell/prj.conf b/samples/dect/dect_phy/dect_shell/prj.conf index 4953610aaaed..c377b8f5ee85 100644 --- a/samples/dect/dect_phy/dect_shell/prj.conf +++ b/samples/dect/dect_phy/dect_shell/prj.conf @@ -31,12 +31,9 @@ CONFIG_SHELL_BACKEND_SERIAL_API_INTERRUPT_DRIVEN=y # Enable use of vsnprintfcb() for extending desh_print() format CONFIG_CBPRINTF_LIBC_SUBSTS=y -CONFIG_MINIMAL_LIBC=n -CONFIG_NEWLIB_LIBC=y -CONFIG_NEWLIB_LIBC_FLOAT_SCANF=y -CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y +CONFIG_COMMON_LIBC_MALLOC=n + CONFIG_FPU=y -#CONFIG_CJSON_LIB=y CONFIG_GETOPT_LONG=y diff --git a/samples/dect/dect_phy/dect_shell/src/startup_cmd/startup_cmd_shell.c b/samples/dect/dect_phy/dect_shell/src/startup_cmd/startup_cmd_shell.c index 24b0540940ac..d8be2c857228 100644 --- a/samples/dect/dect_phy/dect_shell/src/startup_cmd/startup_cmd_shell.c +++ b/samples/dect/dect_phy/dect_shell/src/startup_cmd/startup_cmd_shell.c @@ -68,7 +68,7 @@ static int startup_cmd_shell(const struct shell *shell, size_t argc, char **argv sys_getopt_init(); - int opt, tmp_value; + int opt, tmp_value = 0; startup_cmd_settings_data_read(¤t_settings); newsettings = current_settings; diff --git a/samples/dfu/ab/README.rst b/samples/dfu/ab/README.rst index 2565ca4a752d..173fe29f16e9 100644 --- a/samples/dfu/ab/README.rst +++ b/samples/dfu/ab/README.rst @@ -84,8 +84,8 @@ For example, verifying that the application is running from slot A can be done b .. code-block:: c #define IS_RUNNING_FROM_SLOT_A \ - (FIXED_PARTITION_NODE_OFFSET(DT_CHOSEN(zephyr_code_partition)) == \ - FIXED_PARTITION_OFFSET(cpuapp_slot0_partition)) + (PARTITION_NODE_OFFSET(DT_CHOSEN(zephyr_code_partition)) == \ + PARTITION_OFFSET(cpuapp_slot0_partition)) .. _ab_build_files: diff --git a/samples/dfu/ab/src/ab_utils.c b/samples/dfu/ab/src/ab_utils.c index 741afe0e0e80..377732b56ebd 100644 --- a/samples/dfu/ab/src/ab_utils.c +++ b/samples/dfu/ab/src/ab_utils.c @@ -32,18 +32,18 @@ LOG_MODULE_DECLARE(ab_sample); #else /* CONFIG_PARTITION_MANAGER_ENABLED */ #define CODE_PARTITION DT_CHOSEN(zephyr_code_partition) -#define CODE_PARTITION_OFFSET FIXED_PARTITION_NODE_OFFSET(CODE_PARTITION) +#define CODE_PARTITION_OFFSET PARTITION_NODE_OFFSET(CODE_PARTITION) #define SLOT_A_PARTITION slot0_partition #define SLOT_B_PARTITION slot1_partition -#define SLOT_A_OFFSET FIXED_PARTITION_OFFSET(SLOT_A_PARTITION) -#define SLOT_B_OFFSET FIXED_PARTITION_OFFSET(SLOT_B_PARTITION) -#define SLOT_A_SIZE FIXED_PARTITION_SIZE(SLOT_A_PARTITION) -#define SLOT_B_SIZE FIXED_PARTITION_SIZE(SLOT_B_PARTITION) +#define SLOT_A_OFFSET PARTITION_OFFSET(SLOT_A_PARTITION) +#define SLOT_B_OFFSET PARTITION_OFFSET(SLOT_B_PARTITION) +#define SLOT_A_SIZE PARTITION_SIZE(SLOT_A_PARTITION) +#define SLOT_B_SIZE PARTITION_SIZE(SLOT_B_PARTITION) -#define SLOT_A_FLASH_AREA_ID FIXED_PARTITION_ID(SLOT_A_PARTITION) -#define SLOT_B_FLASH_AREA_ID FIXED_PARTITION_ID(SLOT_B_PARTITION) +#define SLOT_A_FLASH_AREA_ID PARTITION_ID(SLOT_A_PARTITION) +#define SLOT_B_FLASH_AREA_ID PARTITION_ID(SLOT_B_PARTITION) #define IS_SLOT_A \ (CODE_PARTITION_OFFSET >= SLOT_A_OFFSET && \ diff --git a/samples/dfu/ab/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi b/samples/dfu/ab/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi index efeb50e8cd02..4cb93fcff81e 100644 --- a/samples/dfu/ab/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi +++ b/samples/dfu/ab/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi @@ -22,7 +22,7 @@ partitions { /* Merged partition used by the MCUboot (variant 0). */ slot0_partition: partition@40000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(656)>; ranges = <0x0 0x40000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -32,18 +32,20 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot0_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio code partition (variant 0). */ cpurad_slot0_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; reg = <0x52000 DT_SIZE_K(328)>; }; }; /* Merged partition used by the MCUboot (variant 1). */ slot1_partition: partition@100000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x100000 DT_SIZE_K(656)>; ranges = <0x0 0x100000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -53,20 +55,24 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot1_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio code partition (variant 1). */ cpurad_slot1_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; reg = <0x52000 DT_SIZE_K(328)>; }; }; boot_request: partition@1ad000 { + compatible = "zephyr,mapped-partition"; reg = <0x1ad000 16>; }; boot_request_backup: partition@1ad010 { + compatible = "zephyr,mapped-partition"; reg = <0x1ad010 16>; }; }; diff --git a/samples/dfu/ab/sysbuild/nrf54h20dk_nrf54h20_memory_map_ironside_se_conf.overlay b/samples/dfu/ab/sysbuild/nrf54h20dk_nrf54h20_memory_map_ironside_se_conf.overlay index 9686bbb80b5a..0ff871e1b65b 100644 --- a/samples/dfu/ab/sysbuild/nrf54h20dk_nrf54h20_memory_map_ironside_se_conf.overlay +++ b/samples/dfu/ab/sysbuild/nrf54h20dk_nrf54h20_memory_map_ironside_se_conf.overlay @@ -12,16 +12,19 @@ partitions { /* Update the boot partition to reserve the final 0.5 kB for PERIPHCONF/MPCCONF */ cpuapp_boot_partition: boot_partition: partition@30000 { + compatible = "zephyr,mapped-partition"; reg = <0x30000 (DT_SIZE_K(64) - 512)>; }; /* UICR.MPCCONF blob. */ mpcconf_partition: partition@3fe00 { + compatible = "zephyr,mapped-partition"; reg = <0x3fe00 48>; }; /* UICR.PERIPHCONF blob (only used for MCUboot's configuration). */ periphconf_partition: partition@3fe30 { + compatible = "zephyr,mapped-partition"; reg = <0x3fe30 464>; }; }; diff --git a/samples/dfu/ab_split/README.rst b/samples/dfu/ab_split/README.rst index e952e2a61af0..66f0165f7349 100644 --- a/samples/dfu/ab_split/README.rst +++ b/samples/dfu/ab_split/README.rst @@ -107,8 +107,8 @@ For example, verifying that the application is running from slot A can be done b .. code-block:: c #define IS_RUNNING_FROM_SLOT_A \ - (FIXED_PARTITION_NODE_OFFSET(DT_CHOSEN(zephyr_code_partition)) == \ - FIXED_PARTITION_OFFSET(cpuapp_slot0_partition)) + (PARTITION_NODE_OFFSET(DT_CHOSEN(zephyr_code_partition)) == \ + PARTITION_OFFSET(cpuapp_slot0_partition)) .. _ab_split_build_files: diff --git a/samples/dfu/ab_split/src/ab_utils.c b/samples/dfu/ab_split/src/ab_utils.c index 8160366cc783..241c36031dd0 100644 --- a/samples/dfu/ab_split/src/ab_utils.c +++ b/samples/dfu/ab_split/src/ab_utils.c @@ -15,18 +15,18 @@ LOG_MODULE_DECLARE(ab_sample); #define CODE_PARTITION DT_CHOSEN(zephyr_code_partition) -#define CODE_PARTITION_OFFSET FIXED_PARTITION_NODE_OFFSET(CODE_PARTITION) +#define CODE_PARTITION_OFFSET PARTITION_NODE_OFFSET(CODE_PARTITION) #define SLOT_A_PARTITION cpuapp_slot0_partition #define SLOT_B_PARTITION cpuapp_slot1_partition -#define SLOT_A_OFFSET FIXED_PARTITION_OFFSET(SLOT_A_PARTITION) -#define SLOT_B_OFFSET FIXED_PARTITION_OFFSET(SLOT_B_PARTITION) -#define SLOT_A_SIZE FIXED_PARTITION_SIZE(SLOT_A_PARTITION) -#define SLOT_B_SIZE FIXED_PARTITION_SIZE(SLOT_B_PARTITION) +#define SLOT_A_OFFSET PARTITION_OFFSET(SLOT_A_PARTITION) +#define SLOT_B_OFFSET PARTITION_OFFSET(SLOT_B_PARTITION) +#define SLOT_A_SIZE PARTITION_SIZE(SLOT_A_PARTITION) +#define SLOT_B_SIZE PARTITION_SIZE(SLOT_B_PARTITION) -#define SLOT_A_FLASH_AREA_ID FIXED_PARTITION_ID(SLOT_A_PARTITION) -#define SLOT_B_FLASH_AREA_ID FIXED_PARTITION_ID(SLOT_B_PARTITION) +#define SLOT_A_FLASH_AREA_ID PARTITION_ID(SLOT_A_PARTITION) +#define SLOT_B_FLASH_AREA_ID PARTITION_ID(SLOT_B_PARTITION) #define IS_SLOT_A \ (CODE_PARTITION_OFFSET >= SLOT_A_OFFSET && \ diff --git a/samples/dfu/ab_split/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi b/samples/dfu/ab_split/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi index d47ca31a336d..1de8e32b190d 100644 --- a/samples/dfu/ab_split/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi +++ b/samples/dfu/ab_split/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi @@ -15,10 +15,12 @@ &mram1x { partitions { boot_request: partition@1ad000 { + compatible = "zephyr,mapped-partition"; reg = <0x1ad000 16>; }; boot_request_backup: partition@1ad010 { + compatible = "zephyr,mapped-partition"; reg = <0x1ad010 16>; }; }; diff --git a/samples/dfu/ab_split/sysbuild/nrf54h20dk_nrf54h20_memory_map_ironside_se_conf.overlay b/samples/dfu/ab_split/sysbuild/nrf54h20dk_nrf54h20_memory_map_ironside_se_conf.overlay index 9686bbb80b5a..0ff871e1b65b 100644 --- a/samples/dfu/ab_split/sysbuild/nrf54h20dk_nrf54h20_memory_map_ironside_se_conf.overlay +++ b/samples/dfu/ab_split/sysbuild/nrf54h20dk_nrf54h20_memory_map_ironside_se_conf.overlay @@ -12,16 +12,19 @@ partitions { /* Update the boot partition to reserve the final 0.5 kB for PERIPHCONF/MPCCONF */ cpuapp_boot_partition: boot_partition: partition@30000 { + compatible = "zephyr,mapped-partition"; reg = <0x30000 (DT_SIZE_K(64) - 512)>; }; /* UICR.MPCCONF blob. */ mpcconf_partition: partition@3fe00 { + compatible = "zephyr,mapped-partition"; reg = <0x3fe00 48>; }; /* UICR.PERIPHCONF blob (only used for MCUboot's configuration). */ periphconf_partition: partition@3fe30 { + compatible = "zephyr,mapped-partition"; reg = <0x3fe30 464>; }; }; diff --git a/samples/dfu/compressed_update/boards/nrf52840dk_nrf52840.overlay b/samples/dfu/compressed_update/boards/nrf52840dk_nrf52840.overlay index f3c1b0e29066..bc944567d7a8 100644 --- a/samples/dfu/compressed_update/boards/nrf52840dk_nrf52840.overlay +++ b/samples/dfu/compressed_update/boards/nrf52840dk_nrf52840.overlay @@ -11,26 +11,30 @@ &flash0 { partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 0x00010000>; }; slot0_partition: partition@10000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00010000 0x00083000>; }; slot1_partition: partition@93000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x00093000 0x0005d000>; }; storage_partition: partition@f0000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000f0000 0x00010000>; }; diff --git a/samples/dfu/compressed_update/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/dfu/compressed_update/boards/nrf5340dk_nrf5340_cpuapp.overlay index f3c1b0e29066..bc944567d7a8 100644 --- a/samples/dfu/compressed_update/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/dfu/compressed_update/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -11,26 +11,30 @@ &flash0 { partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 0x00010000>; }; slot0_partition: partition@10000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00010000 0x00083000>; }; slot1_partition: partition@93000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x00093000 0x0005d000>; }; storage_partition: partition@f0000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000f0000 0x00010000>; }; diff --git a/samples/dfu/compressed_update/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/dfu/compressed_update/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index b6afb223f26b..bb4a8f89d787 100644 --- a/samples/dfu/compressed_update/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/dfu/compressed_update/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -11,26 +11,30 @@ &cpuapp_rram { partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 0x0000b000>; }; slot0_partition: partition@b000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0000b000 0x000c4000>; }; slot1_partition: partition@cf000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x000cf000 0x00086000>; }; storage_partition: partition@155000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x00155000 0x00010000>; }; diff --git a/samples/dfu/compressed_update/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/samples/dfu/compressed_update/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 92b2f084dd4e..05c6f42bafa9 100644 --- a/samples/dfu/compressed_update/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/samples/dfu/compressed_update/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -11,26 +11,30 @@ &cpuapp_rram { partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 0x00010000>; }; slot0_partition: partition@10000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00010000 0x00123000>; }; slot1_partition: partition@133000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x00133000 0x000a2000>; }; storage_partition: partition@1d5000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x001d5000 0x00010000>; }; diff --git a/samples/dfu/dfu_multi_image/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi b/samples/dfu/dfu_multi_image/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi index 5e7ecbe80d41..ad8ec5b30655 100644 --- a/samples/dfu/dfu_multi_image/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi +++ b/samples/dfu/dfu_multi_image/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi @@ -20,30 +20,37 @@ &mram1x { partitions { cpuapp_slot0_partition: partition@40000 { + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(216)>; }; cpurad_slot0_partition: partition@76000 { + compatible = "zephyr,mapped-partition"; reg = <0x76000 DT_SIZE_K(216)>; }; cpuapp_slot1_partition: partition@ac000 { + compatible = "zephyr,mapped-partition"; reg = <0xac000 DT_SIZE_K(216)>; }; cpurad_slot1_partition: partition@e2000 { + compatible = "zephyr,mapped-partition"; reg = <0xe2000 DT_SIZE_K(216)>; }; cpuppr_code_partition: partition@118000 { + compatible = "zephyr,mapped-partition"; reg = <0x118000 DT_SIZE_K(64)>; }; cpuflpr_code_partition: partition@128000 { + compatible = "zephyr,mapped-partition"; reg = <0x128000 DT_SIZE_K(48)>; }; dfu_multi_image_helper_partition: partition@134000 { + compatible = "zephyr,mapped-partition"; label = "helper"; reg = <0x134000 DT_SIZE_K(448)>; }; diff --git a/samples/dfu/dfu_target/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/dfu/dfu_target/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 7a27cc385676..e7c7027bdc01 100644 --- a/samples/dfu/dfu_target/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/dfu/dfu_target/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -16,6 +16,7 @@ &mram1x { partitions { dfu_target_helper_partition: partition@92000 { + compatible = "zephyr,mapped-partition"; label = "helper"; reg = <0x92000 DT_SIZE_K(328)>; }; diff --git a/samples/dfu/dfu_target/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml b/samples/dfu/dfu_target/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml index 6d74215ae741..a07d542eba8d 100644 --- a/samples/dfu/dfu_target/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml +++ b/samples/dfu/dfu_target/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml @@ -8,12 +8,12 @@ EMPTY_0: size: 0x800 EMPTY_1: address: 0x164000 - end_address: 0x165000 + end_address: 0x17d000 placement: after: - mcuboot_secondary region: flash_primary - size: 0x1000 + size: 0x19000 app: address: 0xe800 end_address: 0xb9000 diff --git a/samples/dfu/fw_loader/usb_mcumgr/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/samples/dfu/fw_loader/usb_mcumgr/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 7b3e17b6dc48..8eda0083ec73 100644 --- a/samples/dfu/fw_loader/usb_mcumgr/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/samples/dfu/fw_loader/usb_mcumgr/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -14,21 +14,25 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(24)>; }; slot0_partition: partition@6000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x6000 DT_SIZE_K(1784)>; }; slot1_partition: partition@1c4000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x1c4000 DT_SIZE_K(116)>; }; storage_partition: partition@1e1000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x1e1000 DT_SIZE_K(16)>; }; diff --git a/samples/dfu/fw_loader/usb_mcumgr/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay b/samples/dfu/fw_loader/usb_mcumgr/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay index 7b3e17b6dc48..8eda0083ec73 100644 --- a/samples/dfu/fw_loader/usb_mcumgr/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay +++ b/samples/dfu/fw_loader/usb_mcumgr/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay @@ -14,21 +14,25 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(24)>; }; slot0_partition: partition@6000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x6000 DT_SIZE_K(1784)>; }; slot1_partition: partition@1c4000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x1c4000 DT_SIZE_K(116)>; }; storage_partition: partition@1e1000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x1e1000 DT_SIZE_K(16)>; }; diff --git a/samples/dfu/fw_loader/usb_mcumgr/prj.conf b/samples/dfu/fw_loader/usb_mcumgr/prj.conf index 92be484ab811..c5436795e718 100644 --- a/samples/dfu/fw_loader/usb_mcumgr/prj.conf +++ b/samples/dfu/fw_loader/usb_mcumgr/prj.conf @@ -77,6 +77,7 @@ CONFIG_CONSOLE=y CONFIG_USB_DEVICE_STACK_NEXT=y CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y # USB backend is serial device +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=y diff --git a/samples/dfu/mcuboot_with_encryption/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/dfu/mcuboot_with_encryption/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index d8fcc343f998..aec4deada14f 100644 --- a/samples/dfu/mcuboot_with_encryption/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/dfu/mcuboot_with_encryption/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -11,16 +11,19 @@ &cpuapp_rram { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 0x12000>; }; slot0_partition: partition@12000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x12000 0xa5000>; }; slot1_partition: partition@b7000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0xb7000 0xa5000>; }; diff --git a/samples/dfu/mcuboot_with_encryption/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/samples/dfu/mcuboot_with_encryption/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 69e0526d729e..13562306ddf9 100644 --- a/samples/dfu/mcuboot_with_encryption/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/samples/dfu/mcuboot_with_encryption/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -11,16 +11,19 @@ &cpuapp_rram { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(72)>; }; slot0_partition: partition@12000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x12000 DT_SIZE_K(916)>; }; slot1_partition: partition@f7000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0xf7000 DT_SIZE_K(916)>; }; diff --git a/samples/dfu/mcuboot_with_encryption/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay b/samples/dfu/mcuboot_with_encryption/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay index 69e0526d729e..13562306ddf9 100644 --- a/samples/dfu/mcuboot_with_encryption/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay +++ b/samples/dfu/mcuboot_with_encryption/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay @@ -11,16 +11,19 @@ &cpuapp_rram { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(72)>; }; slot0_partition: partition@12000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x12000 DT_SIZE_K(916)>; }; slot1_partition: partition@f7000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0xf7000 DT_SIZE_K(916)>; }; diff --git a/samples/dfu/single_slot/boards/nrf54h20dk_nrf54h20_cpuapp_boot_req.overlay b/samples/dfu/single_slot/boards/nrf54h20dk_nrf54h20_cpuapp_boot_req.overlay index d0d43f5f4669..d2cffccb339f 100644 --- a/samples/dfu/single_slot/boards/nrf54h20dk_nrf54h20_cpuapp_boot_req.overlay +++ b/samples/dfu/single_slot/boards/nrf54h20dk_nrf54h20_cpuapp_boot_req.overlay @@ -45,13 +45,14 @@ &mram1x { partitions { boot_partition: partition@30000 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x30000 DT_SIZE_K(24)>; }; /* Main application with the MCUboot header. */ slot0_partition: partition@36000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x36000 DT_SIZE_K(1624)>; ranges = <0x0 0x36000 DT_SIZE_K(1624)>; #address-cells = <1>; @@ -61,13 +62,14 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot0_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(1622)>; }; }; /* Merged partition used by the FW loader. */ slot1_partition: partition@1cc000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x1cc000 DT_SIZE_K(144)>; ranges = <0x0 0x1cc000 DT_SIZE_K(144)>; #address-cells = <1>; @@ -77,28 +79,34 @@ * Offset by the MCUboot header size (2048 bytes). */ fw_loader_partition: cpuapp_slot1_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(60)>; }; /* Radio code partition (part of the FW loader). */ cpurad_slot0_partition: partition@f800 { + compatible = "zephyr,mapped-partition"; reg = <0xf800 DT_SIZE_K(82)>; }; }; boot_request: partition@1f0000 { + compatible = "zephyr,mapped-partition"; reg = <0x1f0000 16>; }; boot_request_backup: partition@1f0010 { + compatible = "zephyr,mapped-partition"; reg = <0x1f0010 16>; }; storage_partition: partition@1f1000 { + compatible = "zephyr,mapped-partition"; reg = <0x1f1000 DT_SIZE_K(40)>; }; periphconf_partition: partition@1fb000 { + compatible = "zephyr,mapped-partition"; reg = <0x1fb000 DT_SIZE_K(8)>; }; }; diff --git a/samples/dfu/single_slot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/dfu/single_slot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 178e3bda3f9f..8cd329ab9713 100644 --- a/samples/dfu/single_slot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/dfu/single_slot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -14,21 +14,25 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(24)>; }; slot0_partition: partition@6000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x6000 DT_SIZE_K(1368)>; }; slot1_partition: partition@15c000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x15c000 DT_SIZE_K(116)>; }; storage_partition: partition@179000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x179000 DT_SIZE_K(16)>; }; diff --git a/samples/dfu/single_slot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/samples/dfu/single_slot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 647991edc661..1c7726d00a6e 100644 --- a/samples/dfu/single_slot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/samples/dfu/single_slot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -14,21 +14,25 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(24)>; }; slot0_partition: partition@6000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x6000 DT_SIZE_K(1784)>; }; slot1_partition: partition@1c4000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x1c4000 DT_SIZE_K(116)>; }; storage_partition: partition@1e1000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x1e1000 DT_SIZE_K(16)>; }; diff --git a/samples/dfu/single_slot/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay b/samples/dfu/single_slot/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay index 647991edc661..1c7726d00a6e 100644 --- a/samples/dfu/single_slot/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay +++ b/samples/dfu/single_slot/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay @@ -14,21 +14,25 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(24)>; }; slot0_partition: partition@6000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x6000 DT_SIZE_K(1784)>; }; slot1_partition: partition@1c4000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x1c4000 DT_SIZE_K(116)>; }; storage_partition: partition@1e1000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x1e1000 DT_SIZE_K(16)>; }; diff --git a/samples/dfu/single_slot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay b/samples/dfu/single_slot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay index 01f810d30b94..777d11297a73 100644 --- a/samples/dfu/single_slot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay +++ b/samples/dfu/single_slot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay @@ -10,25 +10,27 @@ /delete-node/ &storage_partition; &cpuapp_rram { - reg = <0x0 DT_SIZE_K(508)>; - partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(28)>; }; slot0_partition: partition@7000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x7000 DT_SIZE_K(348)>; }; slot1_partition: partition@5e000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x5e000 DT_SIZE_K(116)>; }; storage_partition: partition@7b000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x7b000 DT_SIZE_K(16)>; }; diff --git a/samples/dfu/single_slot/prj_usb_enter.conf b/samples/dfu/single_slot/prj_usb_enter.conf index 3529b10f7d12..50f3b532fe72 100644 --- a/samples/dfu/single_slot/prj_usb_enter.conf +++ b/samples/dfu/single_slot/prj_usb_enter.conf @@ -76,6 +76,7 @@ CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y CONFIG_CDC_ACM_SERIAL_MULTIPLE_INSTANCES=y # USB backend is serial device +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=y diff --git a/samples/dfu/single_slot/prj_usb_enter_dongle.conf b/samples/dfu/single_slot/prj_usb_enter_dongle.conf index 37363b582ac2..9a809edd70e0 100644 --- a/samples/dfu/single_slot/prj_usb_enter_dongle.conf +++ b/samples/dfu/single_slot/prj_usb_enter_dongle.conf @@ -27,6 +27,7 @@ CONFIG_MCUMGR_GRP_OS_RESET_BOOT_MODE=y CONFIG_BASE64=y CONFIG_CRC=y +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_NETBUF_SIZE=1220 CONFIG_MCUMGR_GRP_OS_MCUMGR_PARAMS=y CONFIG_MCUMGR_TRANSPORT_WORKQUEUE_STACK_SIZE=4608 diff --git a/samples/dfu/single_slot/sysbuild/mcuboot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.conf b/samples/dfu/single_slot/sysbuild/mcuboot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.conf index 3b38a6182815..ac59d4d31198 100644 --- a/samples/dfu/single_slot/sysbuild/mcuboot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.conf +++ b/samples/dfu/single_slot/sysbuild/mcuboot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.conf @@ -19,3 +19,5 @@ CONFIG_GPIO=n CONFIG_ISR_TABLES_LOCAL_DECLARATION=y CONFIG_LTO=y + +CONFIG_ENTROPY_PSA_CRYPTO_RNG=n diff --git a/samples/dfu/single_slot/sysbuild/nrf54h20.overlay b/samples/dfu/single_slot/sysbuild/nrf54h20.overlay index 4ce83101a8f0..7f1f951024a7 100644 --- a/samples/dfu/single_slot/sysbuild/nrf54h20.overlay +++ b/samples/dfu/single_slot/sysbuild/nrf54h20.overlay @@ -45,13 +45,14 @@ &mram1x { partitions { boot_partition: partition@30000 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x30000 DT_SIZE_K(24)>; }; /* Main application with the MCUboot header. */ slot0_partition: partition@36000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x36000 DT_SIZE_K(1628)>; ranges = <0x0 0x36000 DT_SIZE_K(1628)>; #address-cells = <1>; @@ -61,13 +62,14 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot0_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(1626)>; }; }; /* Merged partition used by the FW loader. */ slot1_partition: partition@1cd000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x1cd000 DT_SIZE_K(144)>; ranges = <0x0 0x1cd000 DT_SIZE_K(144)>; #address-cells = <1>; @@ -77,20 +79,24 @@ * Offset by the MCUboot header size (2048 bytes). */ fw_loader_partition: cpuapp_slot1_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(60)>; }; /* Radio code partition (part of the FW loader). */ cpurad_slot0_partition: partition@f800 { + compatible = "zephyr,mapped-partition"; reg = <0xf800 DT_SIZE_K(82)>; }; }; storage_partition: partition@1f1000 { + compatible = "zephyr,mapped-partition"; reg = <0x1f1000 DT_SIZE_K(40)>; }; periphconf_partition: partition@1fb000 { + compatible = "zephyr,mapped-partition"; reg = <0x1fb000 DT_SIZE_K(8)>; }; }; diff --git a/samples/dfu/smp_svr/dts/nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi b/samples/dfu/smp_svr/dts/nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi index df8ad5add77d..6f114482b52a 100644 --- a/samples/dfu/smp_svr/dts/nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi +++ b/samples/dfu/smp_svr/dts/nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi @@ -22,7 +22,7 @@ partitions { /* Merged partition used by the MCUboot (variant 0). */ slot0_partition: partition@40000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(656)>; ranges = <0x0 0x40000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -32,18 +32,20 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot0_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio code partition (variant 0). */ cpurad_slot0_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; reg = <0x52000 DT_SIZE_K(328)>; }; }; /* Merged partition used by the MCUboot (variant 1). */ slot1_partition: partition@100000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x100000 DT_SIZE_K(656)>; ranges = <0x0 0x100000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -53,11 +55,13 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot1_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio code partition (variant 1). */ cpurad_slot1_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; reg = <0x52000 DT_SIZE_K(328)>; }; }; diff --git a/samples/dfu/smp_svr/dts/nrf54h20dk_nrf54h20_memory_map_requests.dtsi b/samples/dfu/smp_svr/dts/nrf54h20dk_nrf54h20_memory_map_requests.dtsi index efeb50e8cd02..4cb93fcff81e 100644 --- a/samples/dfu/smp_svr/dts/nrf54h20dk_nrf54h20_memory_map_requests.dtsi +++ b/samples/dfu/smp_svr/dts/nrf54h20dk_nrf54h20_memory_map_requests.dtsi @@ -22,7 +22,7 @@ partitions { /* Merged partition used by the MCUboot (variant 0). */ slot0_partition: partition@40000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(656)>; ranges = <0x0 0x40000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -32,18 +32,20 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot0_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio code partition (variant 0). */ cpurad_slot0_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; reg = <0x52000 DT_SIZE_K(328)>; }; }; /* Merged partition used by the MCUboot (variant 1). */ slot1_partition: partition@100000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x100000 DT_SIZE_K(656)>; ranges = <0x0 0x100000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -53,20 +55,24 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot1_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio code partition (variant 1). */ cpurad_slot1_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; reg = <0x52000 DT_SIZE_K(328)>; }; }; boot_request: partition@1ad000 { + compatible = "zephyr,mapped-partition"; reg = <0x1ad000 16>; }; boot_request_backup: partition@1ad010 { + compatible = "zephyr,mapped-partition"; reg = <0x1ad010 16>; }; }; diff --git a/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l05_memory_map_ext_flash.dtsi b/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l05_memory_map_ext_flash.dtsi index edd6a62975d7..1a75973c59b7 100644 --- a/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l05_memory_map_ext_flash.dtsi +++ b/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l05_memory_map_ext_flash.dtsi @@ -8,16 +8,19 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x000000000 0x00011000>; }; slot0_partition: partition@11000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x000011000 0x00063000>; }; storage_partition: partition@74000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x74000 0x9000>; }; diff --git a/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l10_memory_map_ext_encflash.dtsi b/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l10_memory_map_ext_encflash.dtsi index 3da9470cab5f..c9c6fc5e2be2 100644 --- a/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l10_memory_map_ext_encflash.dtsi +++ b/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l10_memory_map_ext_encflash.dtsi @@ -14,16 +14,19 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(88)>; }; slot0_partition: partition@16000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x16000 DT_SIZE_K(888)>; }; storage_partition: partition@f4000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0xf4000 DT_SIZE_K(36)>; }; diff --git a/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l10_memory_map_ext_flash.dtsi b/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l10_memory_map_ext_flash.dtsi index 722e67013518..4ccab8e673c6 100644 --- a/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l10_memory_map_ext_flash.dtsi +++ b/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l10_memory_map_ext_flash.dtsi @@ -8,16 +8,19 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x000000000 0x00014000>; }; slot0_partition: partition@14000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x000014000 0x000e0000>; }; storage_partition: partition@f4000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0xf4000 0x9000>; }; diff --git a/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l15_memory_map_ext_encflash.dtsi b/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l15_memory_map_ext_encflash.dtsi index 05aebbe42a50..895524ec34c7 100644 --- a/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l15_memory_map_ext_encflash.dtsi +++ b/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l15_memory_map_ext_encflash.dtsi @@ -14,16 +14,19 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(88)>; }; slot0_partition: partition@16000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x16000 DT_SIZE_K(1376)>; }; storage_partition: partition@16e000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x16e000 DT_SIZE_K(36)>; }; diff --git a/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l15_memory_map_ext_flash.dtsi b/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l15_memory_map_ext_flash.dtsi index cb9d4ef15be2..b456e7ca2f19 100644 --- a/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l15_memory_map_ext_flash.dtsi +++ b/samples/dfu/smp_svr/dts/nrf54l15dk_nrf54l15_memory_map_ext_flash.dtsi @@ -8,16 +8,19 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x000000000 0x00014000>; }; slot0_partition: partition@14000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x000014000 0x0015a000>; }; storage_partition: partition@16e000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x16e000 0x9000>; }; diff --git a/samples/dfu/smp_svr/dts/nrf54lm20_nrf54lm20_cpuapp_memory_map_ram_load.dtsi b/samples/dfu/smp_svr/dts/nrf54lm20_nrf54lm20_cpuapp_memory_map_ram_load.dtsi index 5c6a1702f795..1cf6fba2f59c 100644 --- a/samples/dfu/smp_svr/dts/nrf54lm20_nrf54lm20_cpuapp_memory_map_ram_load.dtsi +++ b/samples/dfu/smp_svr/dts/nrf54lm20_nrf54lm20_cpuapp_memory_map_ram_load.dtsi @@ -12,7 +12,7 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; @@ -20,11 +20,13 @@ * for the LLVM configuration variant. */ boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(64)>; }; slot0_partition: partition@10000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x10000 DT_SIZE_K(481)>; }; @@ -32,6 +34,7 @@ /* Gap from 88400 to 88800 to ensure 2kB alignment */ slot1_partition: partition@88800 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x8f800 DT_SIZE_K(481)>; }; @@ -39,6 +42,7 @@ /*0x100C00 to 0x1F8000 - unused */ storage_partition: partition@1f8000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x1f8000 DT_SIZE_K(20)>; }; diff --git a/samples/dfu/smp_svr/dts/nrf54lm20dk_nrf54lm20a_memory_map_ext_encflash.dtsi b/samples/dfu/smp_svr/dts/nrf54lm20dk_nrf54lm20a_memory_map_ext_encflash.dtsi index 9808474b0515..ba39fa404141 100644 --- a/samples/dfu/smp_svr/dts/nrf54lm20dk_nrf54lm20a_memory_map_ext_encflash.dtsi +++ b/samples/dfu/smp_svr/dts/nrf54lm20dk_nrf54lm20a_memory_map_ext_encflash.dtsi @@ -15,16 +15,19 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(88)>; }; slot0_partition: partition@16000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x16000 DT_SIZE_K(1912)>; }; storage_partition: partition@1f4000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x1f4000 DT_SIZE_K(36)>; }; diff --git a/samples/dfu/smp_svr/overlay-bt.conf b/samples/dfu/smp_svr/overlay-bt.conf index 742add33dabf..766e9d951a6d 100644 --- a/samples/dfu/smp_svr/overlay-bt.conf +++ b/samples/dfu/smp_svr/overlay-bt.conf @@ -8,6 +8,7 @@ CONFIG_BT_BUF_ACL_TX_SIZE=502 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 # Disable the (default) serial MCUmgr transport. +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=n # Enable the Bluetooth mcumgr transport (unauthenticated). diff --git a/samples/dfu/smp_svr/prj.conf b/samples/dfu/smp_svr/prj.conf index 8cc0f1385072..764ae2f05493 100644 --- a/samples/dfu/smp_svr/prj.conf +++ b/samples/dfu/smp_svr/prj.conf @@ -8,6 +8,7 @@ CONFIG_FLASH_MAP=y # Enable the serial MCUmgr transport. CONFIG_BASE64=y +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=y CONFIG_CONSOLE=y diff --git a/samples/dfu/smp_svr/prj_ram_load.conf b/samples/dfu/smp_svr/prj_ram_load.conf index 4740bd1b0364..459181083848 100644 --- a/samples/dfu/smp_svr/prj_ram_load.conf +++ b/samples/dfu/smp_svr/prj_ram_load.conf @@ -8,6 +8,7 @@ CONFIG_FLASH_MAP=y # Enable the serial MCUmgr transport. CONFIG_BASE64=y +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=y CONFIG_CONSOLE=y diff --git a/samples/dfu/smp_svr/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay b/samples/dfu/smp_svr/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay index 502c55ddd1cb..780069e9b0e4 100644 --- a/samples/dfu/smp_svr/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay +++ b/samples/dfu/smp_svr/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay @@ -15,16 +15,19 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x000000000 0x00014000>; }; slot0_partition: partition@14000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x000014000 0x0015a000>; }; storage_partition: partition@16e000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x16e000 0x9000>; }; diff --git a/samples/esb/esb_monitor/Kconfig.sysbuild b/samples/esb/esb_monitor/Kconfig.sysbuild index f4cf28f02511..8fa297d21ada 100644 --- a/samples/esb/esb_monitor/Kconfig.sysbuild +++ b/samples/esb/esb_monitor/Kconfig.sysbuild @@ -7,4 +7,7 @@ config PARTITION_MANAGER default n +config NRF_DEFAULT_EMPTY + default y if SOC_SERIES_NRF53X + source "share/sysbuild/Kconfig" diff --git a/samples/esb/esb_prx/Kconfig.sysbuild b/samples/esb/esb_prx/Kconfig.sysbuild index 0db12fee3611..7783aee1890a 100644 --- a/samples/esb/esb_prx/Kconfig.sysbuild +++ b/samples/esb/esb_prx/Kconfig.sysbuild @@ -7,4 +7,7 @@ config PARTITION_MANAGER default n if !BOARD_IS_NON_SECURE +config NRF_DEFAULT_EMPTY + default y if SOC_SERIES_NRF53X + source "share/sysbuild/Kconfig" diff --git a/samples/esb/esb_prx/sysbuild.cmake b/samples/esb/esb_prx/sysbuild.cmake deleted file mode 100644 index ceb42ad8d189..000000000000 --- a/samples/esb/esb_prx/sysbuild.cmake +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -get_property(PM_DOMAINS GLOBAL PROPERTY PM_DOMAINS) - -# Include app core image if enabled -if(SB_CONFIG_SOC_NRF5340_CPUNET) - # Get application core board target - string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") - list(GET split_board_qualifiers 1 target_soc) - set(board_target_appcore "${BOARD}/${target_soc}/cpuapp") - set(target_soc) - - ExternalZephyrProject_Add( - APPLICATION empty_app_core - SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/empty_app_core - BOARD ${board_target_appcore} - BOARD_REVISION ${BOARD_REVISION} - ) - - if(NOT "CPUAPP" IN_LIST PM_DOMAINS) - list(APPEND PM_DOMAINS CPUAPP) - endif() - - set_property(GLOBAL APPEND PROPERTY PM_CPUAPP_IMAGES "empty_app_core") - set_property(GLOBAL PROPERTY DOMAIN_APP_CPUAPP "empty_app_core") - set(CPUAPP_PM_DOMAIN_DYNAMIC_PARTITION empty_app_core CACHE INTERNAL "") -endif() - -set_property(GLOBAL PROPERTY PM_DOMAINS ${PM_DOMAINS}) diff --git a/samples/esb/esb_ptx/Kconfig.sysbuild b/samples/esb/esb_ptx/Kconfig.sysbuild index 0db12fee3611..7783aee1890a 100644 --- a/samples/esb/esb_ptx/Kconfig.sysbuild +++ b/samples/esb/esb_ptx/Kconfig.sysbuild @@ -7,4 +7,7 @@ config PARTITION_MANAGER default n if !BOARD_IS_NON_SECURE +config NRF_DEFAULT_EMPTY + default y if SOC_SERIES_NRF53X + source "share/sysbuild/Kconfig" diff --git a/samples/esb/esb_ptx/sysbuild.cmake b/samples/esb/esb_ptx/sysbuild.cmake deleted file mode 100644 index ceb42ad8d189..000000000000 --- a/samples/esb/esb_ptx/sysbuild.cmake +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -get_property(PM_DOMAINS GLOBAL PROPERTY PM_DOMAINS) - -# Include app core image if enabled -if(SB_CONFIG_SOC_NRF5340_CPUNET) - # Get application core board target - string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") - list(GET split_board_qualifiers 1 target_soc) - set(board_target_appcore "${BOARD}/${target_soc}/cpuapp") - set(target_soc) - - ExternalZephyrProject_Add( - APPLICATION empty_app_core - SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/empty_app_core - BOARD ${board_target_appcore} - BOARD_REVISION ${BOARD_REVISION} - ) - - if(NOT "CPUAPP" IN_LIST PM_DOMAINS) - list(APPEND PM_DOMAINS CPUAPP) - endif() - - set_property(GLOBAL APPEND PROPERTY PM_CPUAPP_IMAGES "empty_app_core") - set_property(GLOBAL PROPERTY DOMAIN_APP_CPUAPP "empty_app_core") - set(CPUAPP_PM_DOMAIN_DYNAMIC_PARTITION empty_app_core CACHE INTERNAL "") -endif() - -set_property(GLOBAL PROPERTY PM_DOMAINS ${PM_DOMAINS}) diff --git a/samples/ironside_se/protectedmem_periphconf/app.overlay b/samples/ironside_se/protectedmem_periphconf/app.overlay index 955cf8cbd085..1fc311a0dd28 100644 --- a/samples/ironside_se/protectedmem_periphconf/app.overlay +++ b/samples/ironside_se/protectedmem_periphconf/app.overlay @@ -13,12 +13,14 @@ /* cpuapp_boot_partition is at 0x30000 with size 64KB (0x10000) */ /* Move periphconf_partition to 0x40000 (right after cpuapp_boot_partition) */ periphconf_partition: partition@40000 { + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(8)>; }; /* Move cpuapp_slot0_partition to start after periphconf_partition */ /* periphconf_partition ends at 0x42000, so slot0 starts there */ cpuapp_slot0_partition: partition@42000 { + compatible = "zephyr,mapped-partition"; reg = <0x42000 DT_SIZE_K(328)>; }; }; diff --git a/samples/ironside_se/protectedmem_periphconf/src/main.c b/samples/ironside_se/protectedmem_periphconf/src/main.c index 38aefb82d82e..005099802f90 100644 --- a/samples/ironside_se/protectedmem_periphconf/src/main.c +++ b/samples/ironside_se/protectedmem_periphconf/src/main.c @@ -9,7 +9,7 @@ #include #include -#define PERIPHCONF_PARTITION_ADDRESS DT_FIXED_PARTITION_ADDR(DT_NODELABEL(periphconf_partition)) +#define PERIPHCONF_PARTITION_ADDRESS DT_PARTITION_ADDR(DT_NODELABEL(periphconf_partition)) #define PERIPHCONF_PARTITION_SIZE DT_REG_SIZE(DT_NODELABEL(periphconf_partition)) #define MRAM_16BYTE_ALIGN 16 #define PARTITION_END (PERIPHCONF_PARTITION_ADDRESS + PERIPHCONF_PARTITION_SIZE) diff --git a/samples/keys/hw_unique_key/boards/nrf21540dk_nrf52840.overlay b/samples/keys/hw_unique_key/boards/nrf21540dk_nrf52840.overlay index 27fb824cb80e..0d4092a94352 100644 --- a/samples/keys/hw_unique_key/boards/nrf21540dk_nrf52840.overlay +++ b/samples/keys/hw_unique_key/boards/nrf21540dk_nrf52840.overlay @@ -3,11 +3,13 @@ &flash0 { partitions { storage_partition: partition@fd000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000fd000 0x00002000>; }; hw_unique_key_partition: partition@ff000 { + compatible = "zephyr,mapped-partition"; label = ""; reg = <0x000ff000 0x00001000>; }; diff --git a/samples/keys/hw_unique_key/boards/nrf52840dk_nrf52840.overlay b/samples/keys/hw_unique_key/boards/nrf52840dk_nrf52840.overlay index 27fb824cb80e..0d4092a94352 100644 --- a/samples/keys/hw_unique_key/boards/nrf52840dk_nrf52840.overlay +++ b/samples/keys/hw_unique_key/boards/nrf52840dk_nrf52840.overlay @@ -3,11 +3,13 @@ &flash0 { partitions { storage_partition: partition@fd000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000fd000 0x00002000>; }; hw_unique_key_partition: partition@ff000 { + compatible = "zephyr,mapped-partition"; label = ""; reg = <0x000ff000 0x00001000>; }; diff --git a/samples/matter/common/src/app/matter_init.cpp b/samples/matter/common/src/app/matter_init.cpp index d38e6f3272c9..1b3cf1d44ef0 100644 --- a/samples/matter/common/src/app/matter_init.cpp +++ b/samples/matter/common/src/app/matter_init.cpp @@ -63,6 +63,8 @@ #include #include +#include + LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL); using namespace ::chip::DeviceLayer; diff --git a/samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp b/samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp index 97b87d685c3c..055d9b1a35e1 100644 --- a/samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp +++ b/samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp @@ -7,9 +7,9 @@ #include "persistent_storage_shell.h" #if defined(CONFIG_SETTINGS_NVS) -#include +#include #elif defined(CONFIG_SETTINGS_ZMS) || defined(CONFIG_SETTINGS_ZMS_LEGACY) -#include +#include #endif #include #include diff --git a/samples/matter/lock/src/access/access_storage_print.cpp b/samples/matter/lock/src/access/access_storage_print.cpp index e750fec932f6..be2ad6cb9878 100644 --- a/samples/matter/lock/src/access/access_storage_print.cpp +++ b/samples/matter/lock/src/access/access_storage_print.cpp @@ -7,9 +7,9 @@ #include "access_storage_print.h" #ifdef CONFIG_SETTINGS_NVS -#include +#include #elif CONFIG_SETTINGS_ZMS || CONFIG_SETTINGS_ZMS_LEGACY -#include +#include #endif /* CONFIG_SETTINGS_NVS */ #include #include diff --git a/samples/matter/thermostat/src/temp_sensor_manager.cpp b/samples/matter/thermostat/src/temp_sensor_manager.cpp index 2dd8ce7111ba..234dfefb477d 100644 --- a/samples/matter/thermostat/src/temp_sensor_manager.cpp +++ b/samples/matter/thermostat/src/temp_sensor_manager.cpp @@ -8,6 +8,8 @@ #include "app/task_executor.h" #include "temperature_measurement/sensor.h" +#include + LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL); using namespace chip; diff --git a/samples/matter/thermostat/src/zcl_callbacks.cpp b/samples/matter/thermostat/src/zcl_callbacks.cpp index 53f07945e4f2..8f34c55801b4 100644 --- a/samples/matter/thermostat/src/zcl_callbacks.cpp +++ b/samples/matter/thermostat/src/zcl_callbacks.cpp @@ -14,6 +14,8 @@ #include #include +#include + LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL); using namespace chip; diff --git a/samples/mcuboot/firmware_loader_entrance/boards/nrf52840dk_nrf52840.overlay b/samples/mcuboot/firmware_loader_entrance/boards/nrf52840dk_nrf52840.overlay index 3db1b0cd6630..908e15f029d0 100644 --- a/samples/mcuboot/firmware_loader_entrance/boards/nrf52840dk_nrf52840.overlay +++ b/samples/mcuboot/firmware_loader_entrance/boards/nrf52840dk_nrf52840.overlay @@ -12,21 +12,25 @@ &flash0 { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(32)>; }; slot0_partition: partition@8000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x8000 DT_SIZE_K(736)>; }; slot1_partition: partition@c0000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0xc0000 DT_SIZE_K(240)>; }; storage_partition: partition@fc000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0xfc000 DT_SIZE_K(16)>; }; diff --git a/samples/mcuboot/firmware_loader_entrance/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/mcuboot/firmware_loader_entrance/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 9028aa86b206..4adb66351647 100644 --- a/samples/mcuboot/firmware_loader_entrance/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/mcuboot/firmware_loader_entrance/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -12,21 +12,25 @@ &cpuapp_rram { partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x0 DT_SIZE_K(40)>; }; slot0_partition: partition@a000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0xa000 DT_SIZE_K(1120)>; }; slot1_partition: partition@122000 { + compatible = "zephyr,mapped-partition"; label = "image-1"; reg = <0x122000 DT_SIZE_K(252)>; }; storage_partition: partition@161000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x161000 DT_SIZE_K(16)>; }; diff --git a/samples/mpsl/timeslot/sysbuild.cmake b/samples/mpsl/timeslot/sysbuild.cmake index ceb42ad8d189..ccea94676877 100644 --- a/samples/mpsl/timeslot/sysbuild.cmake +++ b/samples/mpsl/timeslot/sysbuild.cmake @@ -8,7 +8,7 @@ get_property(PM_DOMAINS GLOBAL PROPERTY PM_DOMAINS) # Include app core image if enabled if(SB_CONFIG_SOC_NRF5340_CPUNET) # Get application core board target - string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") + string(REPLACE "/" ";" split_board_qualifiers ";${BOARD_QUALIFIERS}") list(GET split_board_qualifiers 1 target_soc) set(board_target_appcore "${BOARD}/${target_soc}/cpuapp") set(target_soc) diff --git a/samples/net/aws_iot/sysbuild/mcuboot/prj.conf b/samples/net/aws_iot/sysbuild/mcuboot/prj.conf index 33257bc6cb6c..38d3e09c560c 100644 --- a/samples/net/aws_iot/sysbuild/mcuboot/prj.conf +++ b/samples/net/aws_iot/sysbuild/mcuboot/prj.conf @@ -7,7 +7,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf b/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf index c5dbbe685627..e1bbf9b57bee 100644 --- a/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf +++ b/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf @@ -1,7 +1,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/net/https_client/sysbuild/mcuboot/prj.conf b/samples/net/https_client/sysbuild/mcuboot/prj.conf index 3d9d7c28f0c4..5575379d0cb0 100644 --- a/samples/net/https_client/sysbuild/mcuboot/prj.conf +++ b/samples/net/https_client/sysbuild/mcuboot/prj.conf @@ -1,7 +1,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/nfc/writable_ndef_msg/src/ndef_file_m.c b/samples/nfc/writable_ndef_msg/src/ndef_file_m.c index 0c26b80e6b9f..628d0fb4f320 100644 --- a/samples/nfc/writable_ndef_msg/src/ndef_file_m.c +++ b/samples/nfc/writable_ndef_msg/src/ndef_file_m.c @@ -16,14 +16,14 @@ #include #include #include -#include +#include #include #include #include #if defined(CONFIG_NVS) -#include +#include #elif defined(CONFIG_ZMS) -#include +#include #endif /* defined(CONFIG_NVS) */ #include "ndef_file_m.h" @@ -33,12 +33,12 @@ static const uint8_t m_url[] = /**< Default NDEF message: URL "nordicsemi.com". {'n', 'o', 'r', 'd', 'i', 'c', 's', 'e', 'm', 'i', '.', 'c', 'o', 'm'}; /* Flash partition for storage*/ -#define FLASH_DEVICE FIXED_PARTITION_DEVICE(storage_partition) +#define FLASH_DEVICE PARTITION_DEVICE(storage_partition) /* Flash block size in bytes */ #define SECTOR_SIZE (DT_PROP(DT_CHOSEN(zephyr_flash), erase_block_size)) #define SECTOR_COUNT 2 /* Start address of the filesystem in flash */ -#define STORAGE_OFFSET FIXED_PARTITION_OFFSET(storage_partition) +#define STORAGE_OFFSET PARTITION_OFFSET(storage_partition) #if defined(CONFIG_NVS) static struct nvs_fs fs = { diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf index d68509786738..a15bc7528e3d 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf @@ -4,7 +4,7 @@ CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_MAX_IMG_SECTORS=2048 CONFIG_BOOT_SIGNATURE_TYPE_RSA=y diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf index 5a796c65b93e..7e514f970cf0 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf @@ -1,7 +1,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf index 5514c0eb18fe..4cd7d0580c8f 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf @@ -1,7 +1,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf index 5514c0eb18fe..4cd7d0580c8f 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf @@ -1,7 +1,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/nrf5340/netboot/src/main.c b/samples/nrf5340/netboot/src/main.c index f23e40d02fd5..4737bd425d09 100644 --- a/samples/nrf5340/netboot/src/main.c +++ b/samples/nrf5340/netboot/src/main.c @@ -32,13 +32,13 @@ BUILD_ASSERT((B0N_SIZE % CONFIG_FPROTECT_BLOCK_SIZE) == 0, "B0N_SIZE % CONFIG_FPROTECT_BLOCK_SIZE was not 0. Check the B0_SIZE Kconfig."); #else -#define B0N_ADDRESS FIXED_PARTITION_ADDRESS(b0n_partition) -#define B0N_SIZE (FIXED_PARTITION_SIZE(b0n_partition) + FIXED_PARTITION_SIZE(provision_partition)) -#define S0_ADDRESS FIXED_PARTITION_ADDRESS(s0_partition) -#define S0_SIZE FIXED_PARTITION_SIZE(s0_partition) +#define B0N_ADDRESS PARTITION_ADDRESS(b0n_partition) +#define B0N_SIZE (PARTITION_SIZE(b0n_partition) + PARTITION_SIZE(provision_partition)) +#define S0_ADDRESS PARTITION_ADDRESS(s0_partition) +#define S0_SIZE PARTITION_SIZE(s0_partition) -BUILD_ASSERT(FIXED_PARTITION_ADDRESS(provision_partition) == - (FIXED_PARTITION_ADDRESS(b0n_partition) + FIXED_PARTITION_SIZE(b0n_partition)), +BUILD_ASSERT(PARTITION_ADDRESS(provision_partition) == + (PARTITION_ADDRESS(b0n_partition) + PARTITION_SIZE(b0n_partition)), "`provision` partition must be directly after `b0n` partition."); /* The flash is locked at flash page granularity */ diff --git a/samples/nrf54h20/idle_relocated_tcm/common/memory_map.dtsi b/samples/nrf54h20/idle_relocated_tcm/common/memory_map.dtsi index add7d3076648..a0c8002a6168 100644 --- a/samples/nrf54h20/idle_relocated_tcm/common/memory_map.dtsi +++ b/samples/nrf54h20/idle_relocated_tcm/common/memory_map.dtsi @@ -22,19 +22,20 @@ /* Redefine the "partitions" DTS node. */ partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; ranges; cpuapp_boot_partition: boot_partition: partition@30000 { + compatible = "zephyr,mapped-partition"; reg = <0x30000 0x10000>; label = "mcuboot"; }; /* Image 0, slot 0 (primary slot): merged application and radio core images. */ slot0_partition: partition@40000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(656)>; ranges = <0x0 0x40000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -42,12 +43,14 @@ /* Application code for cpuapp core. */ cpuapp_slot0_partition: partition@800 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio core firmware loader code for cpurad core. */ cpurad_slot0_partition: cpurad_loader_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loader_partition"; reg = <0x52000 DT_SIZE_K(8)>; /* 8 KB allocated (~4 KB actual) */ }; @@ -56,27 +59,31 @@ * to TCM by radio loader for cpurad core. */ cpurad_slot2_partition: cpurad_loaded_fw: partition@54000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loaded_fw"; reg = <0x54000 DT_SIZE_K(192)>; }; /* Remaining space in the slot 0. */ cpurad_slot0_partition_container: partition@84000 { + compatible = "zephyr,mapped-partition"; reg = <0x84000 DT_SIZE_K(128)>; }; }; cpuppr_code_partition: partition@e4000 { + compatible = "zephyr,mapped-partition"; reg = <0xe4000 DT_SIZE_K(64)>; }; cpuflpr_code_partition: partition@f4000 { + compatible = "zephyr,mapped-partition"; reg = <0xf4000 DT_SIZE_K(48)>; }; /* Image 0, slot 1 (secondary slot): merged application and radio core images. */ slot1_partition: partition@100000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x100000 DT_SIZE_K(656)>; ranges = <0x0 0x100000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -84,11 +91,13 @@ /* Application code for cpuapp core. */ cpuapp_slot1_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio core firmware loader code for cpurad core. */ cpurad_slot1_partition: cpurad_loader_partition_slot1: partition@52000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loader_partition_slot1"; reg = <0x52000 DT_SIZE_K(8)>; /* 8 KB allocated (~4 KB actual) */ }; @@ -97,29 +106,35 @@ * to TCM by radio loader for cpurad core. */ cpurad_slot3_partition: cpurad_loaded_fw_slot1: partition@54000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loaded_fw_slot1"; reg = <0x54000 DT_SIZE_K(192)>; }; /* Remaining space in the slot 1. */ cpurad_slot1_partition_container: partition@84000 { + compatible = "zephyr,mapped-partition"; reg = <0x84000 DT_SIZE_K(128)>; }; }; storage_partition: partition@1a4000 { + compatible = "zephyr,mapped-partition"; reg = <0x1a4000 DT_SIZE_K(40)>; }; periphconf_partition: partition@1ae000 { + compatible = "zephyr,mapped-partition"; reg = <0x1ae000 DT_SIZE_K(8)>; }; secondary_partition: partition@1b0000 { + compatible = "zephyr,mapped-partition"; reg = <0x1b0000 DT_SIZE_K(64)>; }; secondary_periphconf_partition: partition@1c0000 { + compatible = "zephyr,mapped-partition"; reg = <0x1c0000 DT_SIZE_K(8)>; }; @@ -129,25 +144,29 @@ * there is no more space after secure_storage_partition. */ secure_storage_partition: partition@1fd000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x1fd000 DT_SIZE_K(12)>; ranges = <0x0 0x1fd000 0x3000>; #address-cells = <1>; #size-cells = <1>; cpuapp_crypto_partition: partition@0 { + compatible = "zephyr,mapped-partition"; reg = <0x0 DT_SIZE_K(4)>; }; cpurad_crypto_partition: partition@1000 { + compatible = "zephyr,mapped-partition"; reg = <0x1000 DT_SIZE_K(4)>; }; cpuapp_its_partition: partition@2000 { + compatible = "zephyr,mapped-partition"; reg = <0x2000 DT_SIZE_K(2)>; }; cpurad_its_partition: partition@2800 { + compatible = "zephyr,mapped-partition"; reg = <0x2800 DT_SIZE_K(2)>; }; }; diff --git a/samples/nrf54h20/idle_relocated_tcm/common/memory_map_split_slot.dtsi b/samples/nrf54h20/idle_relocated_tcm/common/memory_map_split_slot.dtsi index d81304c0308d..179ce09ea0de 100644 --- a/samples/nrf54h20/idle_relocated_tcm/common/memory_map_split_slot.dtsi +++ b/samples/nrf54h20/idle_relocated_tcm/common/memory_map_split_slot.dtsi @@ -22,23 +22,26 @@ /* Redefine the "partitions" DTS node. */ partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; ranges; cpuapp_boot_partition: boot_partition: partition@30000 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x30000 0x10000>; }; /* Image 0, slot 0 (primary slot) - Application code for cpuapp core. */ slot0_partition: cpuapp_slot0_partition: partition@40000 { + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(326)>; }; /* Image 2, slot 0 (primary slot) - radio loader code for cpurad core. */ slot4_partition: cpurad_slot0_partition: cpurad_loader_partition: partition@92000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loader_partition"; reg = <0x92000 DT_SIZE_K(16)>; /* size: radio loader + 2KB trailer MCUboot @@ -50,27 +53,32 @@ * in MRAM that will be loaded to TCM by radio loader for cpurad core. */ slot2_partition: cpurad_slot2_partition: cpurad_loaded_fw: partition@96000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loaded_fw"; reg = <0x96000 DT_SIZE_K(192)>; /* size: application + 192B for s2ram + 2KB trailer MCUboot */ }; cpuppr_code_partition: partition@e4000 { + compatible = "zephyr,mapped-partition"; reg = <0xe4000 DT_SIZE_K(64)>; }; cpuflpr_code_partition: partition@f4000 { + compatible = "zephyr,mapped-partition"; reg = <0xf4000 DT_SIZE_K(48)>; }; /* Image 0, slot 1 (secondary slot) - Application code for cpuapp core. */ slot1_partition: cpuapp_slot1_partition: partition@100000 { + compatible = "zephyr,mapped-partition"; reg = <0x100000 DT_SIZE_K(326)>; }; /* Image 2, slot 1 (secondary slot) - radio loader code for cpurad core. */ slot5_partition: cpurad_slot1_partition: cpurad_loader_partition_slot1: partition@152000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loader_partition_slot1"; reg = <0x152000 DT_SIZE_K(16)>; /* size: radio loader + 2KB trailer MCUboot @@ -82,24 +90,29 @@ * in MRAM that will be loaded to TCM by radio loader for cpurad core. */ slot3_partition: cpurad_slot3_partition: cpurad_loaded_fw_slot1: partition@156000 { + compatible = "zephyr,mapped-partition"; label = "cpurad_loaded_fw_slot1"; reg = <0x156000 DT_SIZE_K(192)>; /* size: application + 192B for s2ram + 2KB trailer MCUboot */ }; storage_partition: partition@1a4000 { + compatible = "zephyr,mapped-partition"; reg = <0x1a4000 DT_SIZE_K(40)>; }; periphconf_partition: partition@1ae000 { + compatible = "zephyr,mapped-partition"; reg = <0x1ae000 DT_SIZE_K(8)>; }; secondary_partition: partition@1b0000 { + compatible = "zephyr,mapped-partition"; reg = <0x1b0000 DT_SIZE_K(64)>; }; secondary_periphconf_partition: partition@1c0000 { + compatible = "zephyr,mapped-partition"; reg = <0x1c0000 DT_SIZE_K(8)>; }; @@ -109,25 +122,29 @@ * there is no more space after secure_storage_partition. */ secure_storage_partition: partition@1fd000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x1fd000 DT_SIZE_K(12)>; ranges = <0x0 0x1fd000 0x3000>; #address-cells = <1>; #size-cells = <1>; cpuapp_crypto_partition: partition@0 { + compatible = "zephyr,mapped-partition"; reg = <0x0 DT_SIZE_K(4)>; }; cpurad_crypto_partition: partition@1000 { + compatible = "zephyr,mapped-partition"; reg = <0x1000 DT_SIZE_K(4)>; }; cpuapp_its_partition: partition@2000 { + compatible = "zephyr,mapped-partition"; reg = <0x2000 DT_SIZE_K(2)>; }; cpurad_its_partition: partition@2800 { + compatible = "zephyr,mapped-partition"; reg = <0x2800 DT_SIZE_K(2)>; }; }; diff --git a/samples/nrf54h20/idle_relocated_tcm/remote/src/main.c b/samples/nrf54h20/idle_relocated_tcm/remote/src/main.c index 083a057a15bf..19fa7eff4fa5 100644 --- a/samples/nrf54h20/idle_relocated_tcm/remote/src/main.c +++ b/samples/nrf54h20/idle_relocated_tcm/remote/src/main.c @@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(idle); #define NVM_ADDRESS(node) \ (COND_CODE_1(DT_FIXED_SUBPARTITION_EXISTS(node), \ (DT_FIXED_SUBPARTITION_ADDR(node)), \ - (DT_FIXED_PARTITION_ADDR(node)))) + (DT_PARTITION_ADDR(node)))) #define CODE_PARTITION_NODE DT_CHOSEN(zephyr_code_partition) #define CODE_PARTITION_START_ADDR NVM_ADDRESS(CODE_PARTITION_NODE) diff --git a/samples/nrf54h20/radio_loader/src/main.c b/samples/nrf54h20/radio_loader/src/main.c index 4e9991386f04..e8c7c1a27b0b 100644 --- a/samples/nrf54h20/radio_loader/src/main.c +++ b/samples/nrf54h20/radio_loader/src/main.c @@ -6,8 +6,8 @@ #include -#define FIXED_PARTITION_ADDRESS(label) DT_REG_ADDR(DT_NODELABEL(label)) -#define FIXED_PARTITION_SIZE(label) DT_REG_SIZE(DT_NODELABEL(label)) +#define PARTITION_ADDRESS(label) DT_REG_ADDR(DT_NODELABEL(label)) +#define PARTITION_SIZE(label) DT_REG_SIZE(DT_NODELABEL(label)) #ifdef CONFIG_USE_DT_CODE_PARTITION #define FLASH_LOAD_ADDRESS DT_REG_ADDR(DT_CHOSEN(zephyr_code_partition)) @@ -42,15 +42,15 @@ BUILD_ASSERT(DT_NODE_EXISTS(DT_NODELABEL(LOADED_FW_PRIMARY_SLOT)), "Missing nodelabel: cpurad_slot2_partition"); BUILD_ASSERT(DT_NODE_EXISTS(DT_NODELABEL(LOADED_FW_SECONDARY_SLOT)), "Missing nodelabel: cpurad_slot3_partition"); -BUILD_ASSERT((FIXED_PARTITION_SIZE(LOADED_FW_PRIMARY_SLOT) == - FIXED_PARTITION_SIZE(LOADED_FW_SECONDARY_SLOT)), +BUILD_ASSERT((PARTITION_SIZE(LOADED_FW_PRIMARY_SLOT) == + PARTITION_SIZE(LOADED_FW_SECONDARY_SLOT)), "LOADED_FW_PRIMARY_SLOT and LOADED_FW_SECONDARY_SLOT sizes are not equal"); BUILD_ASSERT(DT_NODE_EXISTS(DT_NODELABEL(RUNNING_FW_SLOT)), "Missing nodelabel: cpurad_ram0"); -BUILD_ASSERT((FIXED_PARTITION_SIZE(LOADED_FW_PRIMARY_SLOT) <= RUNNING_FW_SLOT_SIZE), +BUILD_ASSERT((PARTITION_SIZE(LOADED_FW_PRIMARY_SLOT) <= RUNNING_FW_SLOT_SIZE), "LOADED_FW_PRIMARY_SLOT size exceeds RUNNING_FW_SLOT size"); -BUILD_ASSERT((FIXED_PARTITION_SIZE(LOADED_FW_SECONDARY_SLOT) <= RUNNING_FW_SLOT_SIZE), +BUILD_ASSERT((PARTITION_SIZE(LOADED_FW_SECONDARY_SLOT) <= RUNNING_FW_SLOT_SIZE), "LOADED_FW_SECONDARY_SLOT size exceeds RUNNING_FW_SLOT size"); /** @@ -74,11 +74,11 @@ static int load_and_jump_to_firmware(void) void *loaded_fw_ram_addr = (void *)(RUNNING_FW_SLOT_ADDR); if (PARTITION_IS_RUNNING_APP_PARTITION(RADIO_LOADER_PRIMARY_SLOT)) { - loaded_fw_nvm_addr = (void *)(FIXED_PARTITION_ADDRESS(LOADED_FW_PRIMARY_SLOT)); - loaded_fw_nvm_size = (size_t)(FIXED_PARTITION_SIZE(LOADED_FW_PRIMARY_SLOT)); + loaded_fw_nvm_addr = (void *)(PARTITION_ADDRESS(LOADED_FW_PRIMARY_SLOT)); + loaded_fw_nvm_size = (size_t)(PARTITION_SIZE(LOADED_FW_PRIMARY_SLOT)); } else { - loaded_fw_nvm_addr = (void *)(FIXED_PARTITION_ADDRESS(LOADED_FW_SECONDARY_SLOT)); - loaded_fw_nvm_size = (size_t)(FIXED_PARTITION_SIZE(LOADED_FW_SECONDARY_SLOT)); + loaded_fw_nvm_addr = (void *)(PARTITION_ADDRESS(LOADED_FW_SECONDARY_SLOT)); + loaded_fw_nvm_size = (size_t)(PARTITION_SIZE(LOADED_FW_SECONDARY_SLOT)); } /* Copy firmware from MRAM to TCM */ diff --git a/samples/nrf_rpc/protocols_serialization/client/boards/nrf52840dk_nrf52840.overlay b/samples/nrf_rpc/protocols_serialization/client/boards/nrf52840dk_nrf52840.overlay index 6f431008c228..14ed84d0e98a 100644 --- a/samples/nrf_rpc/protocols_serialization/client/boards/nrf52840dk_nrf52840.overlay +++ b/samples/nrf_rpc/protocols_serialization/client/boards/nrf52840dk_nrf52840.overlay @@ -16,6 +16,7 @@ &flash0 { partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0xf8000>; }; diff --git a/samples/nrf_rpc/protocols_serialization/client/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/nrf_rpc/protocols_serialization/client/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 80576d1ffd5d..a3d4fb2d5c54 100644 --- a/samples/nrf_rpc/protocols_serialization/client/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/nrf_rpc/protocols_serialization/client/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -29,6 +29,7 @@ partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x15c000>; }; diff --git a/samples/nrf_rpc/protocols_serialization/client/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/samples/nrf_rpc/protocols_serialization/client/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 625e802ed97f..c55cd14d2184 100644 --- a/samples/nrf_rpc/protocols_serialization/client/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/samples/nrf_rpc/protocols_serialization/client/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -28,6 +28,7 @@ partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x1dc000>; }; diff --git a/samples/nrf_rpc/protocols_serialization/client/sample.yaml b/samples/nrf_rpc/protocols_serialization/client/sample.yaml index d1ac73270e93..d461fda72ecf 100644 --- a/samples/nrf_rpc/protocols_serialization/client/sample.yaml +++ b/samples/nrf_rpc/protocols_serialization/client/sample.yaml @@ -19,6 +19,8 @@ common: tags: - ci_build - ci_samples_nrf_rpc + extra_args: + - SNIPPET_ROOT="." tests: sample.nrf_rpc.protocols_serialization.client.rpc_ble: diff --git a/samples/nrf_rpc/protocols_serialization/server/boards/nrf52840dk_nrf52840.overlay b/samples/nrf_rpc/protocols_serialization/server/boards/nrf52840dk_nrf52840.overlay index 55bf76fab986..459c4ee94d75 100644 --- a/samples/nrf_rpc/protocols_serialization/server/boards/nrf52840dk_nrf52840.overlay +++ b/samples/nrf_rpc/protocols_serialization/server/boards/nrf52840dk_nrf52840.overlay @@ -69,16 +69,19 @@ &flash0 { partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x000fb000>; }; storage_partition: partition@fb000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000fb000 0x00002000>; }; coredump_partition: partition@fd000 { + compatible = "zephyr,mapped-partition"; label = ""; reg = <0x000fd000 0x00003000>; }; diff --git a/samples/nrf_rpc/protocols_serialization/server/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/nrf_rpc/protocols_serialization/server/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index a46757e77d34..4e1de0954730 100644 --- a/samples/nrf_rpc/protocols_serialization/server/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/nrf_rpc/protocols_serialization/server/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -77,16 +77,19 @@ partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x00178000>; }; storage_partition: partition@178000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x00178000 0x00002000>; }; coredump_partition: partition@17a000 { + compatible = "zephyr,mapped-partition"; label = ""; reg = <0x0017a000 0x00003000>; }; diff --git a/samples/nrf_rpc/protocols_serialization/server/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/samples/nrf_rpc/protocols_serialization/server/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index bc2afc66b199..d418dd3a31bc 100644 --- a/samples/nrf_rpc/protocols_serialization/server/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/samples/nrf_rpc/protocols_serialization/server/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -69,16 +69,19 @@ partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x001f8000>; }; storage_partition: partition@1f8000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x001f8000 0x00002000>; }; coredump_partition: partition@1fa000 { + compatible = "zephyr,mapped-partition"; label = ""; reg = <0x001fa000 0x00003000>; }; diff --git a/samples/nrf_rpc/protocols_serialization/server/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay b/samples/nrf_rpc/protocols_serialization/server/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay index 61b0db13fb9e..2b16a2696da8 100644 --- a/samples/nrf_rpc/protocols_serialization/server/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay +++ b/samples/nrf_rpc/protocols_serialization/server/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay @@ -69,16 +69,19 @@ partitions { slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00000000 0x001f8000>; }; storage_partition: partition@1f8000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x001f8000 0x00002000>; }; coredump_partition: partition@1fa000 { + compatible = "zephyr,mapped-partition"; label = ""; reg = <0x001fa000 0x00003000>; }; diff --git a/samples/nrf_rpc/protocols_serialization/server/sample.yaml b/samples/nrf_rpc/protocols_serialization/server/sample.yaml index c394a4368cb4..585a61af0748 100644 --- a/samples/nrf_rpc/protocols_serialization/server/sample.yaml +++ b/samples/nrf_rpc/protocols_serialization/server/sample.yaml @@ -19,6 +19,8 @@ common: tags: - ci_build - ci_samples_nrf_rpc + extra_args: + - SNIPPET_ROOT="." tests: sample.nrf_rpc.protocols_serialization.server.rpc_ble: diff --git a/samples/peripheral/radio_test/sysbuild.cmake b/samples/peripheral/radio_test/sysbuild.cmake index 00ad58b90547..eaadb8952144 100644 --- a/samples/peripheral/radio_test/sysbuild.cmake +++ b/samples/peripheral/radio_test/sysbuild.cmake @@ -8,7 +8,7 @@ get_property(PM_DOMAINS GLOBAL PROPERTY PM_DOMAINS) # Include app core image if enabled if(SB_CONFIG_SOC_NRF5340_CPUNET AND NOT SB_CONFIG_BOARD_NRF7002DK) # Get application core board target - string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") + string(REPLACE "/" ";" split_board_qualifiers ";${BOARD_QUALIFIERS}") list(GET split_board_qualifiers 1 target_soc) set(board_target_appcore "${BOARD}/${target_soc}/cpuapp") set(target_soc) diff --git a/samples/tfm/tfm_hello_world/src/main.c b/samples/tfm/tfm_hello_world/src/main.c index feb27a233c36..fd7aa84ff478 100644 --- a/samples/tfm/tfm_hello_world/src/main.c +++ b/samples/tfm/tfm_hello_world/src/main.c @@ -92,6 +92,7 @@ static void print_hex_number(uint8_t *num, size_t len) int main(void) { + bool failed = false; char hello_string[sizeof(HELLO_PATTERN) + sizeof(CONFIG_BOARD_TARGET)]; size_t len; @@ -114,6 +115,7 @@ int main(void) status = psa_generate_random(random_bytes, sizeof(random_bytes)); if (status != PSA_SUCCESS) { printk("psa_generate_random failed with status %d\n", status); + failed = true; } else { print_hex_number(random_bytes, sizeof(random_bytes)); } @@ -127,6 +129,7 @@ int main(void) status = psa_crypto_init(); if (status != PSA_SUCCESS) { printk("psa_crypto_init failed with status %d\n", status); + failed = true; } status = psa_hash_compute(PSA_ALG_SHA_256, hello_string, strlen(hello_string), hello_digest, @@ -134,6 +137,7 @@ int main(void) if (status != PSA_SUCCESS) { printk("psa_hash_compute failed with status %d\n", status); + failed = true; } else { printk("SHA256 digest:\n"); print_hex_number(hello_digest, 32); @@ -148,13 +152,16 @@ int main(void) ret = tfm_platform_s0_active(PM_S0_ADDRESS, PM_S1_ADDRESS, &s0_active); if (ret != 0) { printk("Unexpected failure from spm_s0_active: %d\n", ret); + failed = true; } printk("S0 active? %s\n", s0_active ? "True" : "False"); #endif /* PM_S1_ADDRESS */ #endif /* defined(CONFIG_TFM_PARTITION_PLATFORM) */ - printk("Example finished successfully!\n"); + if (!failed) { + printk("Example finished successfully!\n"); + } - return 0; + return failed; } diff --git a/samples/tfm/tfm_psa_template/prj.conf b/samples/tfm/tfm_psa_template/prj.conf index 4f055828673a..d20279923cfb 100644 --- a/samples/tfm/tfm_psa_template/prj.conf +++ b/samples/tfm/tfm_psa_template/prj.conf @@ -55,6 +55,7 @@ CONFIG_LOG=y CONFIG_MCUBOOT_UTIL_LOG_LEVEL_WRN=y # Enable the serial mcumgr transport. +CONFIG_UART_MCUMGR=y CONFIG_MCUMGR_TRANSPORT_UART=y # Ensure clean log output diff --git a/samples/tfm/tfm_psa_template/sysbuild/mcuboot/prj.conf b/samples/tfm/tfm_psa_template/sysbuild/mcuboot/prj.conf index 21a7a01ae2fc..571627aa0a75 100644 --- a/samples/tfm/tfm_psa_template/sysbuild/mcuboot/prj.conf +++ b/samples/tfm/tfm_psa_template/sysbuild/mcuboot/prj.conf @@ -1,5 +1,5 @@ CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf index b4f4ab31dcef..b27066092e75 100644 --- a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf +++ b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf @@ -12,7 +12,7 @@ CONFIG_SYSTEM_CLOCK_NO_WAIT=y CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_MAX_IMG_SECTORS=2048 CONFIG_BOOT_SIGNATURE_TYPE_RSA=y diff --git a/samples/wifi/shell/sysbuild/mcuboot/prj.conf b/samples/wifi/shell/sysbuild/mcuboot/prj.conf index b03c2233b351..d95cb0a4869c 100644 --- a/samples/wifi/shell/sysbuild/mcuboot/prj.conf +++ b/samples/wifi/shell/sysbuild/mcuboot/prj.conf @@ -7,7 +7,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/samples/zephyr/drivers/mbox/CMakeLists.txt b/samples/zephyr/drivers/mbox/CMakeLists.txt index 1339675519e9..c9f890a42fa1 100644 --- a/samples/zephyr/drivers/mbox/CMakeLists.txt +++ b/samples/zephyr/drivers/mbox/CMakeLists.txt @@ -11,9 +11,9 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr) if(CONFIG_BOARD_NRF54LV10DK_NRF54LV10A_CPUAPP) - message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as Main in this sample") + message(STATUS "${BOARD}/${BOARD_QUALIFIERS} compile as Main in this sample") else() - message(FATAL_ERROR "${BOARD}${BOARD_QUALIFIERS} is not supported for this sample") + message(FATAL_ERROR "${BOARD}/${BOARD_QUALIFIERS} is not supported for this sample") endif() if(NOT SYSBUILD) diff --git a/samples/zephyr/drivers/mbox/remote/CMakeLists.txt b/samples/zephyr/drivers/mbox/remote/CMakeLists.txt index a10fa02bedaf..863c791497d2 100644 --- a/samples/zephyr/drivers/mbox/remote/CMakeLists.txt +++ b/samples/zephyr/drivers/mbox/remote/CMakeLists.txt @@ -10,9 +10,9 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) if(CONFIG_BOARD_NRF54LV10DK_NRF54LV10A_CPUFLPR) - message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as remote in this sample") + message(STATUS "${BOARD}/${BOARD_QUALIFIERS} compile as remote in this sample") else() - message(FATAL_ERROR "${BOARD}${BOARD_QUALIFIERS} is not supported for this sample") + message(FATAL_ERROR "${BOARD}/${BOARD_QUALIFIERS} is not supported for this sample") endif() project(mbox_ipc_remote) diff --git a/samples/zephyr/drivers/mbox/sysbuild.cmake b/samples/zephyr/drivers/mbox/sysbuild.cmake index d74b4e21fcd4..b3e6ce371244 100644 --- a/samples/zephyr/drivers/mbox/sysbuild.cmake +++ b/samples/zephyr/drivers/mbox/sysbuild.cmake @@ -5,16 +5,16 @@ # if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") - message(FATAL_ERROR - "Target ${BOARD}${BOARD_QUALIFIERS} not supported for this sample. " - "There is no remote board selected in Kconfig.sysbuild") + message(FATAL_ERROR + "Target ${BOARD}/${BOARD_QUALIFIERS} not supported for this sample. " + "There is no remote board selected in Kconfig.sysbuild") endif() set(REMOTE_APP remote) ExternalZephyrProject_Add( - APPLICATION ${REMOTE_APP} - SOURCE_DIR ${APP_DIR}/${REMOTE_APP} - BOARD ${SB_CONFIG_REMOTE_BOARD} - BOARD_REVISION ${BOARD_REVISION} + APPLICATION ${REMOTE_APP} + SOURCE_DIR ${APP_DIR}/${REMOTE_APP} + BOARD ${SB_CONFIG_REMOTE_BOARD} + BOARD_REVISION ${BOARD_REVISION} ) diff --git a/samples/zephyr/smp_svr_mini_boot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.conf b/samples/zephyr/smp_svr_mini_boot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.conf index 61e9dc7547bb..339a039a5f90 100644 --- a/samples/zephyr/smp_svr_mini_boot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.conf +++ b/samples/zephyr/smp_svr_mini_boot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.conf @@ -1,2 +1,3 @@ CONFIG_MCUMGR_TRANSPORT_UART=y CONFIG_CONSOLE=y +CONFIG_UART_MCUMGR=y diff --git a/samples/zephyr/smp_svr_mini_boot/pm_static.yml b/samples/zephyr/smp_svr_mini_boot/pm_static.yml index 8879f5ec82c3..91242021bb7c 100644 --- a/samples/zephyr/smp_svr_mini_boot/pm_static.yml +++ b/samples/zephyr/smp_svr_mini_boot/pm_static.yml @@ -48,4 +48,4 @@ settings_storage: unallocated: address: 0xcd000 region: flash_primary - size: 0x98000 + size: 0xb0000 diff --git a/samples/zephyr/smp_svr_mini_boot/sysbuild/nrf54h20dk_nrf54h20_memory_map_direct_xip.dtsi b/samples/zephyr/smp_svr_mini_boot/sysbuild/nrf54h20dk_nrf54h20_memory_map_direct_xip.dtsi index df8ad5add77d..6f114482b52a 100644 --- a/samples/zephyr/smp_svr_mini_boot/sysbuild/nrf54h20dk_nrf54h20_memory_map_direct_xip.dtsi +++ b/samples/zephyr/smp_svr_mini_boot/sysbuild/nrf54h20dk_nrf54h20_memory_map_direct_xip.dtsi @@ -22,7 +22,7 @@ partitions { /* Merged partition used by the MCUboot (variant 0). */ slot0_partition: partition@40000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(656)>; ranges = <0x0 0x40000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -32,18 +32,20 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot0_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio code partition (variant 0). */ cpurad_slot0_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; reg = <0x52000 DT_SIZE_K(328)>; }; }; /* Merged partition used by the MCUboot (variant 1). */ slot1_partition: partition@100000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x100000 DT_SIZE_K(656)>; ranges = <0x0 0x100000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -53,11 +55,13 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot1_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio code partition (variant 1). */ cpurad_slot1_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; reg = <0x52000 DT_SIZE_K(328)>; }; }; diff --git a/scripts/ci/tags_sdk_zephyr.yaml b/scripts/ci/tags_sdk_zephyr.yaml index 5fb0da87abfe..efcc022427a4 100644 --- a/scripts/ci/tags_sdk_zephyr.yaml +++ b/scripts/ci/tags_sdk_zephyr.yaml @@ -1084,11 +1084,11 @@ external: nvs: files: - zephyr/drivers/flash/ - - zephyr/samples/subsys/nvs/ - - zephyr/subsys/fs/nvs/ + - zephyr/samples/subsys/kvss/nvs/ + - zephyr/subsys/kvss/nvs/ - zephyr/subsys/mem_mgmt/ - zephyr/subsys/storage/flash_map/ - - zephyr/tests/subsys/fs/nvs/ + - zephyr/tests/subsys/kvss/nvs/ openamp: files: @@ -1193,10 +1193,10 @@ snippets: zms: files: - - zephyr/subsys/fs/zms/ - - zephyr/include/zephyr/fs/zms.h - - zephyr/samples/subsys/fs/zms/ - - zephyr/tests/subsys/fs/zms/ + - zephyr/subsys/kvss/zms/ + - zephyr/include/zephyr/kvss/zms.h + - zephyr/samples/subsys/kvss/zms/ + - zephyr/tests/subsys/kvss/zms/ arch: files: diff --git a/scripts/pip-audit-whitelist.yml b/scripts/pip-audit-whitelist.yml index e7ed89da1175..e13d5cc17744 100644 --- a/scripts/pip-audit-whitelist.yml +++ b/scripts/pip-audit-whitelist.yml @@ -5,3 +5,5 @@ py: - GHSA-f83h-ghpp-7wcc - CVE-2025-69277 - CVE-2026-0994 + - CVE-2026-4539 + - CVE-2026-34591 diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index 4d73b05adfa7..7c46ffb594a1 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -58,3 +58,41 @@ platforms: - nrf54h20dk@0.9.0/nrf54h20/cpuapp comment: "Needs alignment to work with IronSide SE" + +- scenarios: + - sample.bluetooth.mesh_dfu_distributor + - sample.bluetooth.mesh_dfu_distributor.dfu_ext_flash + - sample.bluetooth.mesh_dfu_distributor.settings_ext_flash + - sample.bluetooth.mesh_dfu_distributor.smp_bt_auth + - sample.bluetooth.mesh_dfu_target + - sample.bluetooth.mesh_dfu_target.dfu_ext_flash + - sample.bluetooth.mesh_dfu_target.settings_ext_flash + platforms: + - nrf54l15dk/nrf54l15/cpuapp + comment: "https://nordicsemi.atlassian.net/browse/NCSDK-36963" + +- scenarios: + - applications.nrf_desktop.zrelease + - applications.nrf_desktop.zrelease_keyboard + platforms: + - nrf54ls05dk@0.2.0/nrf54ls05b/cpuapp + comment: "https://nordicsemi.atlassian.net/browse/NCSDK-39099" + +- scenarios: + - sample.bluetooth.peripheral_lbs + - sample.bluetooth.peripheral_lbs_no_security + - sample.bluetooth.peripheral_power_profiling + - sample.bluetooth.peripheral_power_profiling.auto_conn_advert_lfrc_0dBm_100ms.54h + - sample.bluetooth.peripheral_power_profiling.auto_conn_advert_lfrc_0dBm_30ms.54h + - sample.bluetooth.peripheral_power_profiling.auto_conn_advert_lfrc_8dBm_100ms.54h + - sample.bluetooth.peripheral_power_profiling.auto_conn_advert_lfrc_8dBm_30ms.54h + - sample.bluetooth.peripheral_power_profiling.auto_conn_advert_lfxo_0dBm_100ms + - sample.bluetooth.peripheral_power_profiling.auto_conn_advert_lfxo_0dBm_30ms + - sample.bluetooth.peripheral_power_profiling.auto_conn_advert_lfxo_8dBm_100ms + - sample.bluetooth.peripheral_power_profiling.auto_conn_advert_lfxo_8dBm_30ms + - sample.bluetooth.peripheral_power_profiling.auto_non_conn_advert_lfxo_0dbm_100ms + - sample.bluetooth.peripheral_power_profiling.auto_non_conn_advert_lfxo_0dbm_30ms + - sample.bluetooth.peripheral_power_profiling.console_log + platforms: + - nrf54h20dk@0.9.0/nrf54h20/cpuapp + comment: "https://nordicsemi.atlassian.net/browse/NCSDK-39126" diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index c62890bee6a8..afa66cfc5b75 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -64,7 +64,7 @@ comment: "https://nordicsemi.atlassian.net/browse/NCSDK-29462" - scenarios: - - sample.filesystem.fat_fs.nrf54l15dk + - sample.filesystem.fat_fs.nrf54l15 platforms: - nrf54l15dk/nrf54l15/cpuapp comment: "https://nordicsemi.atlassian.net/browse/NCSDK-34573" @@ -116,6 +116,8 @@ - scenarios: - bluetooth.shell.shell_br + - bluetooth.shell.shell_br.accept_conn_as_central + - bluetooth.shell.shell_br.did platforms: - qemu_cortex_m3/ti_lm3s6965 comment: "https://github.com/zephyrproject-rtos/zephyr/issues/89488" @@ -231,6 +233,26 @@ - nrf9160dk@0.14.0/nrf9160 comment: "https://nordicsemi.atlassian.net/browse/NCSDK-38955" +- scenarios: + - wifi.build.ap + - wifi.build.crypto_alt + - wifi.build.crypto_enterprise + - wifi.build.crypto_psa + - wifi.build.disable_advanced_feat + - wifi.build.dpp + - wifi.build.enterprise_runtime + - wifi.build.hostapd_ap + - wifi.build.hostapd_ap_enterprise + - wifi.build.hostapd_dpp + - wifi.build.hostapd_wps + - wifi.build.p2p + - wifi.build.roaming + - wifi.build.wpa3 + - wifi.build.wps + platforms: + - native_sim/native + comment: "https://nordicsemi.atlassian.net/browse/NCSDK-39122" + # --------------------------------- Won't fix section ----------------------------------- - scenarios: @@ -241,9 +263,10 @@ comment: "Won't be fixed - https://nordicsemi.atlassian.net/browse/NCSDK-18853" - scenarios: - - sample.tfm.regression_ipc_lvl1 - - sample.tfm.regression_ipc_lvl2 - - sample.tfm.regression_sfn + - tf-m.regression.ipc.lvl1 + - tf-m.regression.ipc.lvl2 + - tf-m.regression.sfn.profile.not_set + - tf-m.regression.sfn.profile.small - sample.tfm.psa_test_protected_storage - sample.tfm.psa_test_internal_trusted_storage - sample.tfm.psa_test_storage @@ -288,6 +311,7 @@ - scenarios: - .*secure_storage.* + - arch.shared_interrupt.lto.speed - benchmark.crypto.mbedtls - benchmark.kernel.core - cpp.libcxx.glibcxx.newlib @@ -336,6 +360,8 @@ - libraries.encoding.json - libraries.hash_map.cxx.djb2 - libraries.heap + - libraries.heap.hardening_full + - libraries.heap.hardening_none - libraries.libc.c11_threads.minimal - libraries.libc.c11_threads.newlib - libraries.libc.c11_threads.newlib_nano @@ -356,6 +382,8 @@ - message_bus.zbus.general_unittests - message_bus.zbus.general_unittests_without_priority_boost - message_bus.zbus.hlp_priority_boost + - message_bus.zbus.proxy_agent.ipc_backend + - message_bus.zbus.proxy_agent.proxy_agent - mgmt.mcumgr.fs.mgmt.hash.supported.all - mgmt.mcumgr.fs.mgmt.hash.supported.sha256 - mgmt.mcumgr.os.info @@ -407,6 +435,7 @@ - kernel.common.tls - kernel.timer.timer - libraries.encoding.jwt.rsa.psa + - libraries.heap.hardening_full - net.coap.server.common - net.http.server.common - net.http.server.crime @@ -533,6 +562,8 @@ - scenarios: - kernel.scheduler.simple_timeslicing + - sample.display.shield + - tests.drivers.display.check.shield platforms: - nrf52dk/nrf52832 comment: "region RAM overflowed" @@ -576,3 +607,19 @@ platforms: - qemu_cortex_m3/ti_lm3s6965 comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31667" + +- scenarios: + - scripts.dashboard + platforms: + - native_sim/native + comment: "The dashboard does not support sysbuild images" + +- scenarios: + - crypto.secp256r1.mbedtls + - crypto.secp256r1.p256-m_raw + platforms: + - nrf54l15dk/nrf54l15/cpuapp + - nrf54lm20dk/nrf54lm20b/cpuapp + - nrf54h20dk@0.9.0/nrf54h20/cpuapp + - nrf54h20dk@0.9.0/nrf54h20/cpurad + comment: "Not supported in NCS" diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt index f658010da5ef..b4706a9bf5e2 100644 --- a/scripts/requirements-fixed.txt +++ b/scripts/requirements-fixed.txt @@ -83,7 +83,7 @@ libusbsio==2.2.0 ; python_version >= "3.12" and python_version < "4.0" libuuu==1.5.243 ; python_version >= "3.12" and python_version < "4.0" license-expression==30.4.4 ; python_version >= "3.12" and python_version < "4.0" lpc-checksum==3.0.0 ; python_version >= "3.12" and python_version < "4.0" -lxml==5.4.0 ; python_version >= "3.12" and python_version < "4.0" +lxml==6.1.0 ; python_version >= "3.12" and python_version < "4.0" markupsafe==3.0.3 ; python_version >= "3.12" and python_version < "4.0" matter-idl==1.0.0 ; python_version >= "3.12" and python_version < "4.0" mccabe==0.7.0 ; python_version >= "3.12" and python_version < "4.0" @@ -135,7 +135,7 @@ pytest==9.0.3 ; python_version >= "3.12" and python_version < "4.0" python-can==4.6.1 ; python_version >= "3.12" and python_version < "4.0" python-dateutil==2.9.0.post0 ; python_version >= "3.12" and python_version < "4.0" python-debian==1.0.1 ; python_version >= "3.12" and python_version < "4.0" -python-dotenv==1.2.1 ; python_version >= "3.12" and python_version < "4.0" +python-dotenv==1.2.2 ; python_version >= "3.12" and python_version < "4.0" python-magic-bin==0.4.14 ; python_version >= "3.12" and python_version < "4.0" and sys_platform == "win32" python-magic==0.4.27 ; python_version >= "3.12" and python_version < "4.0" python-path==0.1.3 ; python_version >= "3.12" and python_version < "4.0" @@ -170,7 +170,7 @@ spsdk-mcu-link==0.6.6 ; python_version >= "3.12" and python_version < "4.0" spsdk-pyocd==0.3.4 ; python_version >= "3.12" and python_version < "4.0" spsdk==3.6.0 ; python_version >= "3.12" and python_version < "4.0" stringcase==1.2.0 ; python_version >= "3.12" and python_version < "4.0" -svada==2.2.0 ; python_version >= "3.12" and python_version < "4.0" +svada==2.2.1 ; python_version >= "3.12" and python_version < "4.0" t61codec==1.0.1 ; python_version >= "3.12" and python_version < "4.0" tabulate==0.9.0 ; python_version >= "3.12" and python_version < "4.0" toml==0.10.2 ; python_version >= "3.12" and python_version < "4.0" diff --git a/scripts/tools-versions-darwin.yml b/scripts/tools-versions-darwin.yml index 61a243d80669..ac874557bc35 100644 --- a/scripts/tools-versions-darwin.yml +++ b/scripts/tools-versions-darwin.yml @@ -18,8 +18,8 @@ west: nanopb: version: 0.4.6 zephyr-sdk: - version: 0.17.0 - architectures: # https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.17.0 + version: 1.0.1 + architectures: # https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v1.0.1 - arm-zephyr-eabi - riscv64-zephyr-elf doxygen: diff --git a/scripts/tools-versions-linux.yml b/scripts/tools-versions-linux.yml index 3eefc58321ab..41ec22d33037 100644 --- a/scripts/tools-versions-linux.yml +++ b/scripts/tools-versions-linux.yml @@ -17,8 +17,8 @@ gn: nanopb: version: 0.4.6 zephyr-sdk: - version: 0.17.0 - architectures: # https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.17.0 + version: 1.0.1 + architectures: # https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v1.0.1 - arm-zephyr-eabi - riscv64-zephyr-elf ccache: diff --git a/scripts/tools-versions-win10.yml b/scripts/tools-versions-win10.yml index afd5b97706f6..e32f4b420174 100644 --- a/scripts/tools-versions-win10.yml +++ b/scripts/tools-versions-win10.yml @@ -17,8 +17,8 @@ west: nanopb: version: 0.4.6 zephyr-sdk: - version: 0.17.0 - architectures: # https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.17.0 + version: 1.0.1 + architectures: # https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v1.0.1 - arm-zephyr-eabi - riscv64-zephyr-elf doxygen: diff --git a/snippets/coverage_support/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/snippets/coverage_support/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 6ad3fabe6572..36c221f86e8c 100644 --- a/snippets/coverage_support/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/snippets/coverage_support/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -19,6 +19,7 @@ &mram1x { partitions { cpurad_slot0_partition: partition@ba000 { + compatible = "zephyr,mapped-partition"; reg = <0xba000 DT_SIZE_K(168)>; }; }; diff --git a/snippets/coverage_support/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/snippets/coverage_support/boards/nrf54h20dk_nrf54h20_cpurad.overlay index 1e7a3e87222d..49d813147ee3 100644 --- a/snippets/coverage_support/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/snippets/coverage_support/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -10,6 +10,7 @@ &mram1x { partitions { cpurad_slot0_partition: partition@ba000 { + compatible = "zephyr,mapped-partition"; reg = <0xba000 DT_SIZE_K(168)>; }; }; diff --git a/snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20-mem-map-move.dtsi b/snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20-mem-map-move.dtsi index f987c2428401..b07e0076fe66 100644 --- a/snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20-mem-map-move.dtsi +++ b/snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20-mem-map-move.dtsi @@ -10,6 +10,7 @@ * It will likely need to be updated as the MRAM memory map is not yet final. */ cpurad_storage_partition: partition@1e3000 { + compatible = "zephyr,mapped-partition"; reg = <0x1e3000 DT_SIZE_K(24)>; }; }; diff --git a/snippets/nrf70-wifi/nrf54h20_rad_new_memory_map.overlay b/snippets/nrf70-wifi/nrf54h20_rad_new_memory_map.overlay index a041514381e7..9caed400f2d3 100644 --- a/snippets/nrf70-wifi/nrf54h20_rad_new_memory_map.overlay +++ b/snippets/nrf70-wifi/nrf54h20_rad_new_memory_map.overlay @@ -16,35 +16,42 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; cpuapp_boot_partition: partition@30000 { + compatible = "zephyr,mapped-partition"; reg = <0x30000 DT_SIZE_K(64)>; }; slot0_partition: cpuapp_slot0_partition: partition@40000 { + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(1076)>; }; cpurad_slot0_partition: partition@14d000 { + compatible = "zephyr,mapped-partition"; reg = <0x14d000 DT_SIZE_K(328)>; }; cpuppr_code_partition: partition@19f000 { + compatible = "zephyr,mapped-partition"; reg = <0x19f000 DT_SIZE_K(64)>; }; cpuflpr_code_partition: partition@1af000 { + compatible = "zephyr,mapped-partition"; reg = <0x1af000 DT_SIZE_K(48)>; }; storage_partition: partition@1bb000 { + compatible = "zephyr,mapped-partition"; reg = <0x1bb000 DT_SIZE_K(40)>; }; periphconf_partition: partition@1c5000 { + compatible = "zephyr,mapped-partition"; reg = <0x1c5000 DT_SIZE_K(8)>; }; }; diff --git a/snippets/nrf70-wifi/nrf54h20_wifi_memory_map.overlay b/snippets/nrf70-wifi/nrf54h20_wifi_memory_map.overlay index 3e35205516c3..9ae872c08c12 100644 --- a/snippets/nrf70-wifi/nrf54h20_wifi_memory_map.overlay +++ b/snippets/nrf70-wifi/nrf54h20_wifi_memory_map.overlay @@ -9,36 +9,43 @@ /delete-node/ partitions; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; ranges; cpuapp_boot_partition: partition@30000 { + compatible = "zephyr,mapped-partition"; reg = <0x30000 DT_SIZE_K(64)>; }; slot0_partition: cpuapp_slot0_partition: partition@40000 { + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(1076)>; }; cpurad_slot0_partition: partition@14d000 { + compatible = "zephyr,mapped-partition"; reg = <0x14d000 DT_SIZE_K(328)>; }; cpuppr_code_partition: partition@19f000 { + compatible = "zephyr,mapped-partition"; reg = <0x19f000 DT_SIZE_K(64)>; }; cpuflpr_code_partition: partition@1af000 { + compatible = "zephyr,mapped-partition"; reg = <0x1af000 DT_SIZE_K(48)>; }; storage_partition: partition@1bb000 { + compatible = "zephyr,mapped-partition"; reg = <0x1bb000 DT_SIZE_K(40)>; }; periphconf_partition: partition@1c5000 { + compatible = "zephyr,mapped-partition"; reg = <0x1c5000 DT_SIZE_K(8)>; }; }; diff --git a/soc/nordic/sysbuild.cmake b/soc/nordic/sysbuild.cmake index 3c81f0e816cb..53bef4d86b9b 100644 --- a/soc/nordic/sysbuild.cmake +++ b/soc/nordic/sysbuild.cmake @@ -3,7 +3,7 @@ if(SB_CONFIG_VPR_LAUNCHER) set(launcher_core "cpuapp") - string(REPLACE "/" ";" launcher_quals ${BOARD_QUALIFIERS}) + string(REPLACE "/" ";" launcher_quals ";${BOARD_QUALIFIERS}") list(LENGTH launcher_quals launcher_quals_len) list(GET launcher_quals 1 launcher_soc) list(GET launcher_quals 2 launcher_vpr) diff --git a/subsys/bluetooth/fast_pair/fp_crypto/CMakeLists.txt b/subsys/bluetooth/fast_pair/fp_crypto/CMakeLists.txt index 51fb8d233fe5..fe66e10c3388 100644 --- a/subsys/bluetooth/fast_pair/fp_crypto/CMakeLists.txt +++ b/subsys/bluetooth/fast_pair/fp_crypto/CMakeLists.txt @@ -5,6 +5,7 @@ # zephyr_library_named(fp_crypto) +add_dependencies(fp_crypto zephyr_generated_headers) if(CONFIG_BT_FAST_PAIR_CRYPTO) target_sources(fp_crypto PRIVATE fp_crypto_common.c) diff --git a/subsys/bluetooth/fast_pair/fp_registration_data.c b/subsys/bluetooth/fast_pair/fp_registration_data.c index dc0882a69e83..3e28e51a925b 100644 --- a/subsys/bluetooth/fast_pair/fp_registration_data.c +++ b/subsys/bluetooth/fast_pair/fp_registration_data.c @@ -22,9 +22,9 @@ LOG_MODULE_DECLARE(fast_pair, CONFIG_BT_FAST_PAIR_LOG_LEVEL); #define FP_PARTITION_ID PM_BT_FAST_PAIR_ID #define FP_PARTITION_SIZE PM_BT_FAST_PAIR_SIZE #else -BUILD_ASSERT(FIXED_PARTITION_EXISTS(bt_fast_pair_partition)); -#define FP_PARTITION_ID FIXED_PARTITION_ID(bt_fast_pair_partition) -#define FP_PARTITION_SIZE FIXED_PARTITION_SIZE(bt_fast_pair_partition) +BUILD_ASSERT(PARTITION_EXISTS(bt_fast_pair_partition)); +#define FP_PARTITION_ID PARTITION_ID(bt_fast_pair_partition) +#define FP_PARTITION_SIZE PARTITION_SIZE(bt_fast_pair_partition) #endif static const uint8_t fp_magic[] = {0xFA, 0x57, 0xFA, 0x57}; diff --git a/subsys/bluetooth/fast_pair/fp_storage/CMakeLists.txt b/subsys/bluetooth/fast_pair/fp_storage/CMakeLists.txt index ecd5b1eda624..b33a2b95c863 100644 --- a/subsys/bluetooth/fast_pair/fp_storage/CMakeLists.txt +++ b/subsys/bluetooth/fast_pair/fp_storage/CMakeLists.txt @@ -5,6 +5,7 @@ # zephyr_library_named(fp_storage) +add_dependencies(fp_storage zephyr_generated_headers) if(CONFIG_BT_FAST_PAIR_STORAGE_MANAGER) zephyr_linker_sources(SECTIONS fp_storage_manager.ld) diff --git a/subsys/bootloader/bl_boot/bl_boot.c b/subsys/bootloader/bl_boot/bl_boot.c index 614e8a0ba4f5..8fb24e87675b 100644 --- a/subsys/bootloader/bl_boot/bl_boot.c +++ b/subsys/bootloader/bl_boot/bl_boot.c @@ -42,7 +42,7 @@ */ #define RWX_SKIP_SIZE 0 #else -#define RWX_PROTECTION_REGION FIXED_PARTITION_SIZE(b0_partition) +#define RWX_PROTECTION_REGION PARTITION_SIZE(b0_partition) #define RWX_SKIP_SIZE CONFIG_SB_DISABLE_SELF_RWX_SKIP_SIZE #endif @@ -77,10 +77,10 @@ #define S1_IMAGE_ADDRESS (PM_S1_IMAGE_ADDRESS + RWX_SKIP_SIZE) #define S1_IMAGE_SIZE (PM_S1_IMAGE_SIZE - RWX_SKIP_SIZE) #else -#define S0_IMAGE_ADDRESS (FIXED_PARTITION_OFFSET(s0_partition) + RWX_SKIP_SIZE) -#define S0_IMAGE_SIZE (FIXED_PARTITION_SIZE(s0_partition) - RWX_SKIP_SIZE) -#define S1_IMAGE_ADDRESS (FIXED_PARTITION_OFFSET(s1_partition) + RWX_SKIP_SIZE) -#define S1_IMAGE_SIZE (FIXED_PARTITION_SIZE(s1_partition) - RWX_SKIP_SIZE) +#define S0_IMAGE_ADDRESS (PARTITION_OFFSET(s0_partition) + RWX_SKIP_SIZE) +#define S0_IMAGE_SIZE (PARTITION_SIZE(s0_partition) - RWX_SKIP_SIZE) +#define S1_IMAGE_ADDRESS (PARTITION_OFFSET(s1_partition) + RWX_SKIP_SIZE) +#define S1_IMAGE_SIZE (PARTITION_SIZE(s1_partition) - RWX_SKIP_SIZE) #endif BUILD_ASSERT((S0_IMAGE_ADDRESS % NRF_RRAM_REGION_ADDRESS_RESOLUTION) == 0, diff --git a/subsys/bootloader/bl_validation/bl_validation.c b/subsys/bootloader/bl_validation/bl_validation.c index b142fb04055e..22c780ccd1b1 100644 --- a/subsys/bootloader/bl_validation/bl_validation.c +++ b/subsys/bootloader/bl_validation/bl_validation.c @@ -164,11 +164,11 @@ bool bl_validate_firmware(uint32_t fw_dst_address, uint32_t fw_src_address) #else /* USE_PARTITION_MANAGER */ /* DTS Partitions */ #include -#define S0_SIZE FIXED_PARTITION_SIZE(s0_partition) +#define S0_SIZE PARTITION_SIZE(s0_partition) #if !defined(CONFIG_SOC_NRF5340_CPUNET) /* Same as described for PM, above, except that this time we use DTS partition labels */ -#define S1_SIZE FIXED_PARTITION_SIZE(s1_partition) +#define S1_SIZE PARTITION_SIZE(s1_partition) #endif #endif diff --git a/subsys/debug/coredump/coredump_backend_nrf.c b/subsys/debug/coredump/coredump_backend_nrf.c index ed5e1e752f8c..3a8bc40c0f55 100644 --- a/subsys/debug/coredump/coredump_backend_nrf.c +++ b/subsys/debug/coredump/coredump_backend_nrf.c @@ -40,8 +40,6 @@ #error "Unsupported internal flash controller" #endif -#define PARTITION_LABEL coredump_partition - /* Extract DTS properties */ #define FLASH_NODE DT_INST(0, soc_nv_flash) @@ -53,15 +51,15 @@ #define FLASH_ERASE_SIZE FLASH_WRITE_SIZE #endif -#define PARTITION_OFFSET FIXED_PARTITION_OFFSET(PARTITION_LABEL) -#define PARTITION_SIZE FIXED_PARTITION_SIZE(PARTITION_LABEL) -#define PARTITION_ADDR FIXED_PARTITION_ADDRESS(PARTITION_LABEL) +#define COREDUMP_PARTITION_OFFSET PARTITION_OFFSET(coredump_partition) +#define COREDUMP_PARTITION_SIZE PARTITION_SIZE(coredump_partition) +#define COREDUMP_PARTITION_ADDR PARTITION_ADDRESS(coredump_partition) #define STORAGE_ALIGN FLASH_WRITE_SIZE -BUILD_ASSERT(FIXED_PARTITION_EXISTS(PARTITION_LABEL), +BUILD_ASSERT(PARTITION_EXISTS(coredump_partition), "Missing fixed partition named 'coredump_partition'"); -BUILD_ASSERT(PARTITION_OFFSET % FLASH_ERASE_SIZE == 0, +BUILD_ASSERT(COREDUMP_PARTITION_OFFSET % FLASH_ERASE_SIZE == 0, "Core dump partition unaligned to erase block size"); #elif IS_ENABLED(CONFIG_DEBUG_COREDUMP_BACKEND_NRF_RAM_REGION) @@ -75,18 +73,18 @@ BUILD_ASSERT(PARTITION_OFFSET % FLASH_ERASE_SIZE == 0, #endif #define CDUMP_NODE DT_NODELABEL(coredump_storage_region) -#define PARTITION_SIZE DT_REG_SIZE(CDUMP_NODE) +#define COREDUMP_PARTITION_SIZE DT_REG_SIZE(CDUMP_NODE) #define STORAGE_ALIGN 4U #define _COREDUMP_RAM_SECTION Z_GENERIC_SECTION(LINKER_DT_NODE_REGION_NAME_TOKEN(CDUMP_NODE)) /* Buffer spans the DTS COREDUMP_STORAGE region (NOLOAD linker section). */ -static uint8_t _COREDUMP_RAM_SECTION __aligned(STORAGE_ALIGN) coredump_ram[PARTITION_SIZE]; +static uint8_t _COREDUMP_RAM_SECTION __aligned(STORAGE_ALIGN) coredump_ram[COREDUMP_PARTITION_SIZE]; -#define PARTITION_ADDR UINT_TO_POINTER((uintptr_t)coredump_ram) +#define COREDUMP_PARTITION_ADDR UINT_TO_POINTER((uintptr_t)coredump_ram) -BUILD_ASSERT(sizeof(coredump_ram) == PARTITION_SIZE); +BUILD_ASSERT(sizeof(coredump_ram) == COREDUMP_PARTITION_SIZE); #else #error "Enable NRF coredump backend: FLASH_PARTITION or RAM_REGION (see Kconfig)" @@ -106,7 +104,7 @@ enum { }; #if IS_ENABLED(CONFIG_DEBUG_COREDUMP_BACKEND_NRF_RAM_REGION) -BUILD_ASSERT(PARTITION_SIZE >= HEADER_SIZE + WRITE_BUF_SIZE, +BUILD_ASSERT(COREDUMP_PARTITION_SIZE >= HEADER_SIZE + WRITE_BUF_SIZE, "coredump_storage_region too small for header and write buffer"); #endif @@ -120,12 +118,12 @@ static uint16_t dump_crc; /* CRC16 of already written or buffered bytes */ static inline const struct header *get_stored_header(void) { - return (const struct header *)(PARTITION_ADDR); + return (const struct header *)(COREDUMP_PARTITION_ADDR); } static inline const uint8_t *get_stored_dump(const struct header *header) { - return (const uint8_t *)(PARTITION_ADDR) + header->offset; + return (const uint8_t *)(COREDUMP_PARTITION_ADDR) + header->offset; } static inline uint16_t calc_header_crc(const struct header *header) @@ -151,7 +149,7 @@ static inline bool validate_dump(const struct header *header) static inline bool is_within_partition(uint32_t offset, size_t size) { - return (offset < PARTITION_SIZE) && (size <= PARTITION_SIZE - offset); + return (offset < COREDUMP_PARTITION_SIZE) && (size <= COREDUMP_PARTITION_SIZE - offset); } static void write(uint32_t offset, const uint8_t *data, size_t size) @@ -169,7 +167,7 @@ static void write(uint32_t offset, const uint8_t *data, size_t size) #ifdef CONFIG_NRFX_NVMC for (uint32_t i = 0; i < size; i += sizeof(uint32_t)) { - nrfx_nvmc_word_write(PARTITION_OFFSET + offset + i, + nrfx_nvmc_word_write(COREDUMP_PARTITION_OFFSET + offset + i, UNALIGNED_GET((const uint32_t *)&data[i])); } while (!nrfx_nvmc_write_done_check()) { @@ -182,7 +180,7 @@ static void write(uint32_t offset, const uint8_t *data, size_t size) nrf_rramc_config_set(NRF_RRAMC, &config); - memcpy(UINT_TO_POINTER(FLASH_ADDR + PARTITION_OFFSET + offset), data, size); + memcpy(UINT_TO_POINTER(FLASH_ADDR + COREDUMP_PARTITION_OFFSET + offset), data, size); barrier_dmem_fence_full(); /* @@ -198,7 +196,7 @@ static void write(uint32_t offset, const uint8_t *data, size_t size) #else /* RAM */ - memcpy((uint8_t *)(PARTITION_ADDR) + offset, data, size); + memcpy((uint8_t *)(COREDUMP_PARTITION_ADDR) + offset, data, size); barrier_dmem_fence_full(); #endif @@ -219,7 +217,7 @@ static void erase(uint32_t offset, size_t size) #ifdef CONFIG_NRFX_NVMC for (uint32_t end = offset + size; offset < end; offset += FLASH_ERASE_SIZE) { - (void)nrfx_nvmc_page_erase(PARTITION_OFFSET + offset); + (void)nrfx_nvmc_page_erase(COREDUMP_PARTITION_OFFSET + offset); } #elif defined(CONFIG_NRFX_RRAMC) nrf_rramc_config_t config = { @@ -229,7 +227,7 @@ static void erase(uint32_t offset, size_t size) nrf_rramc_config_set(NRF_RRAMC, &config); - memset(UINT_TO_POINTER(FLASH_ADDR + PARTITION_OFFSET + offset), 0xff, size); + memset(UINT_TO_POINTER(FLASH_ADDR + COREDUMP_PARTITION_OFFSET + offset), 0xff, size); barrier_dmem_fence_full(); /* @@ -245,7 +243,7 @@ static void erase(uint32_t offset, size_t size) #else /* RAM */ - memset((uint8_t *)(PARTITION_ADDR) + offset, 0xff, size); + memset((uint8_t *)(COREDUMP_PARTITION_ADDR) + offset, 0xff, size); barrier_dmem_fence_full(); #endif @@ -276,10 +274,10 @@ static void nrf_coredump_backend_start(void) * For flash: erase the entire partition to prepare it for write. * For RRAM: erase the previously written header only. */ - erase(0, IS_ENABLED(CONFIG_NRFX_NVMC) ? PARTITION_SIZE : HEADER_SIZE); + erase(0, IS_ENABLED(CONFIG_NRFX_NVMC) ? COREDUMP_PARTITION_SIZE : HEADER_SIZE); #else /* RAM backend: clear the whole region before writing a new dump. */ - erase(0, PARTITION_SIZE); + erase(0, COREDUMP_PARTITION_SIZE); #endif write_buf_pos = 0; @@ -382,7 +380,7 @@ static int nrf_coredump_backend_cmd(enum coredump_cmd_id cmd_id, void *arg) ret = (validate_header(header) && validate_dump(header)) ? 1 : 0; break; case COREDUMP_CMD_ERASE_STORED_DUMP: - erase(0, PARTITION_SIZE); + erase(0, COREDUMP_PARTITION_SIZE); ret = 0; break; case COREDUMP_CMD_COPY_STORED_DUMP: diff --git a/subsys/dfu/dfu_target/src/dfu_target_mcuboot.c b/subsys/dfu/dfu_target/src/dfu_target_mcuboot.c index d30ba3ecdb66..834b0c2c71ed 100644 --- a/subsys/dfu/dfu_target/src/dfu_target_mcuboot.c +++ b/subsys/dfu/dfu_target/src/dfu_target_mcuboot.c @@ -78,14 +78,14 @@ LOG_MODULE_REGISTER(dfu_target_mcuboot, CONFIG_DFU_TARGET_LOG_LEVEL); */ #define SEC_PAT_NODELABEL(i) UTIL_CAT(slot, UTIL_CAT(UTIL_INC(UTIL_X2(i)), _partition)) -#define SEC_PAT_ADDRESS(i) FIXED_PARTITION_OFFSET(SEC_PAT_NODELABEL(i)) +#define SEC_PAT_ADDRESS(i) PARTITION_OFFSET(SEC_PAT_NODELABEL(i)) -#define SEC_PAT_SIZE(i) FIXED_PARTITION_SIZE(SEC_PAT_NODELABEL(i)) +#define SEC_PAT_SIZE(i) PARTITION_SIZE(SEC_PAT_NODELABEL(i)) #define _MB_SEC_PAT(i, x) UTIL_CAT(SEC_PAT_, x)(i) /* Ignore the 'x' parameter, it is needed for compatibility with Partition Manager scenarios. */ -#define _MB_SEC_PAT_DEV(i, x) FIXED_PARTITION_DEVICE(SEC_PAT_NODELABEL(i)) +#define _MB_SEC_PAT_DEV(i, x) PARTITION_DEVICE(SEC_PAT_NODELABEL(i)) /* Ignore the 'x' parameter, it is needed for compatibility with Partition Manager scenarios. */ #define _MB_SEC_PAT_STRING(i, x) STRINGIFY(SEC_PAT_NODELABEL(i)) diff --git a/subsys/emds/emds.c b/subsys/emds/emds.c index fc4315af68e0..7e5859a7df98 100644 --- a/subsys/emds/emds.c +++ b/subsys/emds/emds.c @@ -122,8 +122,8 @@ static int emds_partition_init(const uint8_t id, struct emds_partition *partitio int emds_init(emds_store_cb_t cb) { - const uint8_t id[] = {FIXED_PARTITION_ID(emds_partition_0), - FIXED_PARTITION_ID(emds_partition_1)}; + const uint8_t id[] = {PARTITION_ID(emds_partition_0), + PARTITION_ID(emds_partition_1)}; int rc; if (emds_state != EMDS_STATE_NOT_INITIALIZED) { @@ -131,8 +131,8 @@ int emds_init(emds_store_cb_t cb) return -EALREADY; } - if (!FIXED_PARTITION_EXISTS(emds_partition_0) || - !FIXED_PARTITION_EXISTS(emds_partition_1)) { + if (!PARTITION_EXISTS(emds_partition_0) || + !PARTITION_EXISTS(emds_partition_1)) { LOG_ERR("EMDS partitions not found: %d, %d", id[0], id[1]); return -ENODEV; } diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig index 0e6ab6b2a778..10971c192713 100644 --- a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig +++ b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig @@ -11,6 +11,7 @@ config MCUMGR_GRP_IMG_NRF depends on MCUMGR_GRP_IMG default y if PARTITION_MANAGER_ENABLED default y if MCUMGR_GRP_IMG_TOO_LARGE_BOOTLOADER_INFO + default y if NCS_MCUBOOT_BOOTLOADER_SIGN_MERGED_BINARY help Enables use of an extended version of the image management implementation that adds Nordic-specific functionalities. diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c index b45b9d26d709..5a23e8ba1caf 100644 --- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c +++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c @@ -61,76 +61,91 @@ BUILD_ASSERT(PM_MCUBOOT_PAD_SIZE == PM_MCUBOOT_SECONDARY_PAD_SIZE); #define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE) #endif -#define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label) \ - (FIXED_PARTITION_OFFSET(label) == (PM_ADDRESS - PM_ADDRESS_OFFSET)) +#define PARTITION_IS_RUNNING_APP_PARTITION(label) \ + (PARTITION_OFFSET(label) == (PM_ADDRESS - PM_ADDRESS_OFFSET)) #else /* ! USE_PARTITION_MANAGER */ + +#ifdef CONFIG_FLASH_USES_MAPPED_PARTITION +#define PARTITION_IS_RUNNING_APP_PARTITION(label) \ + DT_SAME_NODE(PARTITION_NODE_MTD(DT_CHOSEN(zephyr_code_partition)), \ + PARTITION_MTD(label)) && \ + (PARTITION_ADDRESS(label) <= \ + PARTITION_NODE_ADDRESS(DT_CHOSEN(zephyr_code_partition)) && \ + PARTITION_ADDRESS(label) + PARTITION_SIZE(label) >= \ + PARTITION_NODE_ADDRESS(DT_CHOSEN(zephyr_code_partition)) + \ + PARTITION_NODE_SIZE(DT_CHOSEN(zephyr_code_partition))) + +#else #ifndef CONFIG_FLASH_LOAD_OFFSET #error MCUmgr requires application to be built with CONFIG_FLASH_LOAD_OFFSET set \ to be able to figure out application running slot. #endif -#define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label) \ - DT_SAME_NODE(FIXED_PARTITION_NODE_MTD(DT_CHOSEN(zephyr_code_partition)), \ - FIXED_PARTITION_MTD(label)) && \ - (FIXED_PARTITION_OFFSET(label) <= CONFIG_FLASH_LOAD_OFFSET && \ - FIXED_PARTITION_OFFSET(label) + FIXED_PARTITION_SIZE(label) > CONFIG_FLASH_LOAD_OFFSET) +#define PARTITION_IS_RUNNING_APP_PARTITION(label) \ + DT_SAME_NODE(PARTITION_NODE_MTD(DT_CHOSEN(zephyr_code_partition)), \ + PARTITION_MTD(label)) && \ + (PARTITION_ADDRESS(label) <= \ + (CONFIG_FLASH_BASE_ADDRESS + CONFIG_FLASH_LOAD_OFFSET) && \ + PARTITION_ADDRESS(label) + PARTITION_SIZE(label) > \ + (CONFIG_FLASH_BASE_ADDRESS + CONFIG_FLASH_LOAD_OFFSET)) +#endif /* CONFIG_FLASH_USES_MAPPED_PARTITION */ #endif /* USE_PARTITION_MANAGER */ BUILD_ASSERT(sizeof(struct image_header) == IMAGE_HEADER_SIZE, "struct image_header not required size"); #if CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER >= 2 -#if FIXED_PARTITION_EXISTS(slot0_ns_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot0_ns_partition) +#if PARTITION_EXISTS(slot0_ns_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot0_ns_partition) #define ACTIVE_IMAGE_IS 0 -#elif FIXED_PARTITION_EXISTS(slot0_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot0_partition) +#elif PARTITION_EXISTS(slot0_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot0_partition) #define ACTIVE_IMAGE_IS 0 -#elif FIXED_PARTITION_EXISTS(slot1_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition) +#elif PARTITION_EXISTS(slot1_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition) #define ACTIVE_IMAGE_IS 0 -#elif FIXED_PARTITION_EXISTS(slot2_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot2_partition) +#elif PARTITION_EXISTS(slot2_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot2_partition) #define ACTIVE_IMAGE_IS 1 -#elif FIXED_PARTITION_EXISTS(slot3_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot3_partition) +#elif PARTITION_EXISTS(slot3_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot3_partition) #define ACTIVE_IMAGE_IS 1 -#elif FIXED_PARTITION_EXISTS(slot4_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot4_partition) +#elif PARTITION_EXISTS(slot4_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot4_partition) #define ACTIVE_IMAGE_IS 2 -#elif FIXED_PARTITION_EXISTS(slot5_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot5_partition) +#elif PARTITION_EXISTS(slot5_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot5_partition) #define ACTIVE_IMAGE_IS 2 -#elif FIXED_PARTITION_EXISTS(slot6_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot6_partition) +#elif PARTITION_EXISTS(slot6_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot6_partition) #define ACTIVE_IMAGE_IS 3 -#elif FIXED_PARTITION_EXISTS(slot7_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot7_partition) +#elif PARTITION_EXISTS(slot7_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot7_partition) #define ACTIVE_IMAGE_IS 3 -#elif FIXED_PARTITION_EXISTS(slot8_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot8_partition) +#elif PARTITION_EXISTS(slot8_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot8_partition) #define ACTIVE_IMAGE_IS 4 -#elif FIXED_PARTITION_EXISTS(slot9_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot9_partition) +#elif PARTITION_EXISTS(slot9_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot9_partition) #define ACTIVE_IMAGE_IS 4 -#elif FIXED_PARTITION_EXISTS(slot10_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot10_partition) +#elif PARTITION_EXISTS(slot10_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot10_partition) #define ACTIVE_IMAGE_IS 5 -#elif FIXED_PARTITION_EXISTS(slot11_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot11_partition) +#elif PARTITION_EXISTS(slot11_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot11_partition) #define ACTIVE_IMAGE_IS 5 -#elif FIXED_PARTITION_EXISTS(slot12_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot12_partition) +#elif PARTITION_EXISTS(slot12_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot12_partition) #define ACTIVE_IMAGE_IS 6 -#elif FIXED_PARTITION_EXISTS(slot13_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot13_partition) +#elif PARTITION_EXISTS(slot13_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot13_partition) #define ACTIVE_IMAGE_IS 6 -#elif FIXED_PARTITION_EXISTS(slot14_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot14_partition) +#elif PARTITION_EXISTS(slot14_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot14_partition) #define ACTIVE_IMAGE_IS 7 -#elif FIXED_PARTITION_EXISTS(slot15_partition) && \ - FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot15_partition) +#elif PARTITION_EXISTS(slot15_partition) && \ + PARTITION_IS_RUNNING_APP_PARTITION(slot15_partition) #define ACTIVE_IMAGE_IS 7 #else #define ACTIVE_IMAGE_IS 0 @@ -261,7 +276,7 @@ int img_mgmt_active_slot(int image) #if defined(CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE) || \ defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP) || \ defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT) - if (FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) { + if (PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) { slot += 1; } #endif @@ -281,7 +296,7 @@ int img_mgmt_active_slot(int image) slot = (int)temp_slot; #else /* This covers single image, including DirectXiP */ - if (FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) { + if (PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) { slot = 1; } #endif diff --git a/subsys/net/lib/downloader/src/dl_socket.c b/subsys/net/lib/downloader/src/dl_socket.c index 44665c58b895..2f9629c3f6cf 100644 --- a/subsys/net/lib/downloader/src/dl_socket.c +++ b/subsys/net/lib/downloader/src/dl_socket.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include diff --git a/subsys/net/lib/hostap_crypto/Kconfig b/subsys/net/lib/hostap_crypto/Kconfig index d94e930c23ad..20bc7e8e0ce7 100644 --- a/subsys/net/lib/hostap_crypto/Kconfig +++ b/subsys/net/lib/hostap_crypto/Kconfig @@ -53,7 +53,6 @@ config HOSTAP_CRYPTO_ALT_PSA select MBEDTLS_MD_C select MBEDTLS_PK_WRITE_C select MBEDTLS_ENABLE_HEAP - select MBEDTLS_PSA_CRYPTO_C select MBEDTLS_USE_PSA_CRYPTO select PSA_WANT_ALG_HMAC select PSA_WANT_ALG_CMAC diff --git a/subsys/net/lib/nrf70_fw_ext/ext_fw_load.c b/subsys/net/lib/nrf70_fw_ext/ext_fw_load.c index 6a92c74b4687..da3ca71d91e5 100644 --- a/subsys/net/lib/nrf70_fw_ext/ext_fw_load.c +++ b/subsys/net/lib/nrf70_fw_ext/ext_fw_load.c @@ -57,7 +57,7 @@ static const char nrf70_fw_patch[] = { #include #define NRF70_FW_PATCH_ID PM_NRF70_WIFI_FW_ID #else -#define NRF70_FW_PATCH_ID FIXED_PARTITION_ID(nrf70_fw_partition) +#define NRF70_FW_PATCH_ID PARTITION_ID(nrf70_fw_partition) #endif static const struct flash_area *fa; diff --git a/subsys/net/openthread/rpc/client/ot_rpc_if.c b/subsys/net/openthread/rpc/client/ot_rpc_if.c index 0bed97ec7e79..5307141c97bd 100644 --- a/subsys/net/openthread/rpc/client/ot_rpc_if.c +++ b/subsys/net/openthread/rpc/client/ot_rpc_if.c @@ -17,6 +17,7 @@ #include #include #include +#include LOG_MODULE_DECLARE(ot_rpc, LOG_LEVEL_DBG); diff --git a/subsys/net/openthread/rpc/server/ot_rpc_instance.c b/subsys/net/openthread/rpc/server/ot_rpc_instance.c index aa6c45a5869a..0eeffb02da11 100644 --- a/subsys/net/openthread/rpc/server/ot_rpc_instance.c +++ b/subsys/net/openthread/rpc/server/ot_rpc_instance.c @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/subsys/nrf_security/CMakeLists.txt b/subsys/nrf_security/CMakeLists.txt index 07aaa82639a5..495a299d9286 100644 --- a/subsys/nrf_security/CMakeLists.txt +++ b/subsys/nrf_security/CMakeLists.txt @@ -97,7 +97,7 @@ add_library(psa_crypto_config INTERFACE) # Add config files required for PSA crypto interface target_compile_definitions(psa_crypto_config INTERFACE - -DMBEDTLS_CONFIG_FILE="${CONFIG_MBEDTLS_CFG_FILE}" + -DMBEDTLS_CONFIG_FILE="${CONFIG_MBEDTLS_CONFIG_FILE}" -DMBEDTLS_PSA_CRYPTO_CONFIG_FILE="${CONFIG_MBEDTLS_PSA_CRYPTO_CONFIG_FILE}" ) @@ -108,7 +108,7 @@ add_library(psa_crypto_library_config INTERFACE) # Add config files required for PSA core target_compile_definitions(psa_crypto_library_config INTERFACE - -DMBEDTLS_CONFIG_FILE="${CONFIG_MBEDTLS_CFG_FILE}" + -DMBEDTLS_CONFIG_FILE="${CONFIG_MBEDTLS_CONFIG_FILE}" -DMBEDTLS_PSA_CRYPTO_CONFIG_FILE="${CONFIG_MBEDTLS_PSA_CRYPTO_CONFIG_FILE}" -DMBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE="${CONFIG_MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE}" ) diff --git a/subsys/nrf_security/Kconfig b/subsys/nrf_security/Kconfig index 21fe2489ab46..911bbcb84481 100644 --- a/subsys/nrf_security/Kconfig +++ b/subsys/nrf_security/Kconfig @@ -26,6 +26,10 @@ choice PSA_CRYPTO_PROVIDER default PSA_CRYPTO_PROVIDER_CUSTOM if SOC_FAMILY_NORDIC_NRF && ARM endchoice +config PSA_CRYPTO_PROVIDER_CUSTOM + depends on !BUILD_WITH_TFM + select MBEDTLS_PSA_CRYPTO_C + config NRF_SECURITY def_bool y depends on PSA_CRYPTO_PROVIDER_CUSTOM || BUILD_WITH_TFM @@ -33,7 +37,13 @@ config NRF_SECURITY # NCS does not use TF-M's BL2 bootloader, but uses it's own fork # of MCUBoot instead (CONFIG_BOOTLOADER_MCUBOOT). select TFM_BL2_NOT_SUPPORTED if BUILD_WITH_TFM - select PSA_CRYPTO_CLIENT + +if NRF_SECURITY && !MBEDTLS +# This file gets included only if MBEDTLS, but it defines options that we +# make use of even when !MBEDTLS (such as MBEDTLS_PSA_CRYPTO_C). +# Include it in this scenario to make said options available. +rsource "$(ZEPHYR_BASE)/modules/mbedtls/Kconfig.tf-psa-crypto" +endif # Include Nordic-only PSA configurations rsource "Kconfig.psa.nordic" @@ -43,13 +53,22 @@ config PSA_PROMPTLESS if NRF_SECURITY +# Include TLS/DTLS and x509 configurations +rsource "Kconfig.tls" + +# Include PSA Crypto configurations +rsource "Kconfig.psa" + +# Include Legacy mbed TLS configurations +rsource "Kconfig.legacy" + config MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS bool default y if HAS_HW_NRF_CRACEN && PSA_CRYPTO_DRIVER_CRACEN help Promptless option used to control if the PSA Crypto core should have support for builtin keys or not. -config MBEDTLS_CFG_FILE +config MBEDTLS_CONFIG_FILE default "nrf-config.h" config MBEDTLS_PSA_CRYPTO_CONFIG @@ -115,17 +134,6 @@ config MBEDTLS_ENTROPY_POLL This file is not useful for TF-M build where entropy should come from SPE image, using psa_generate_random - -# Include TLS/DTLS and x509 configurations -rsource "Kconfig.tls" - -# Include PSA Crypto configurations -rsource "Kconfig.psa" - -# Include Legacy mbed TLS configurations -rsource "Kconfig.legacy" - - # This Kconfig symbol is referenced in nrf_security CMake code but is # configured out-of-tree. Define it here to satisfy the linter and ensure # it is always defined. diff --git a/subsys/nrf_security/Kconfig.psa b/subsys/nrf_security/Kconfig.psa index 1df4cf48cabd..1dc58586f353 100644 --- a/subsys/nrf_security/Kconfig.psa +++ b/subsys/nrf_security/Kconfig.psa @@ -4,14 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -config MBEDTLS_PSA_CRYPTO_C - bool "PSA crypto APIs" - default y - help - Enable the Platform Security Architecture cryptography API. - Corresponds to setting in mbed TLS config file. - -if MBEDTLS_PSA_CRYPTO_C +if PSA_CRYPTO_CLIENT config MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER bool @@ -28,17 +21,9 @@ config MBEDTLS_PSA_CRYPTO_DRIVERS bool default y -config PSA_DEFAULT_OFF - bool - -config MBEDTLS_PSA_CRYPTO_CLIENT - bool - default y - rsource "src/drivers/Kconfig" - menu "PSA API support" config MBEDTLS_PSA_CRYPTO_SPM @@ -55,10 +40,7 @@ config MBEDTLS_PSA_CRYPTO_STORAGE_C Corresponds to MBEDTLS_PSA_CRYPTO_STORAGE_C setting in mbed TLS config file. config MBEDTLS_USE_PSA_CRYPTO - bool "PSA APIs for X.509 and TLS library" - default y if !MBEDTLS_LEGACY_CRYPTO_C - help - Corresponds to MBEDTLS_USE_PSA_CRYPTO setting in mbed TLS config file. + default n if MBEDTLS_LEGACY_CRYPTO_C config MBEDTLS_PSA_KEY_SLOT_COUNT int "Number of PSA key slots available" @@ -70,12 +52,6 @@ config MBEDTLS_PSA_KEY_SLOT_COUNT transparent keys that we can have open concurrently. The default value comes from MBedTLS. -config MBEDTLS_PSA_STATIC_KEY_SLOTS - bool "Static key slots for PSA" - help - When this option is enabled the PSA core doesn't use the heap to store keys. - It uses a static buffer to hold the key material. - config PSA_CRYPTO_SYS_INIT bool "Invoke psa_crypto_init during system initialization" default y @@ -97,4 +73,4 @@ config PSA_CRYPTO_DRIVER_ALG_PRNG_TEST endmenu # PSA API support -endif # MBEDTLS_PSA_CRYPTO_C +endif # PSA_CRYPTO_CLIENT diff --git a/subsys/nrf_security/Kconfig.psa.nordic b/subsys/nrf_security/Kconfig.psa.nordic index ec24dc624306..481352e5fd3d 100644 --- a/subsys/nrf_security/Kconfig.psa.nordic +++ b/subsys/nrf_security/Kconfig.psa.nordic @@ -398,10 +398,13 @@ config PSA_WANT_ECC_TWISTED_EDWARDS_255 config PSA_WANT_ECC_TWISTED_EDWARDS_448 bool "PSA ECC Edwards448 (Ed448) support" if !PSA_PROMPTLESS +config PSA_WANT_ECC_SECP_R1_224 + bool "PSA ECC secp224r1 support [DEPRECATED]" if !PSA_PROMPTLESS + select DEPRECATED + config PSA_WANT_ECC_SECP_K1_224 bool "PSA ECC secp224k1 support" if !PSA_PROMPTLESS - config PSA_WANT_ECC_SECT_R1_233 bool "PSA ECC sect233r1 support" if !PSA_PROMPTLESS @@ -676,5 +679,10 @@ config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY +config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE + bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE" if !MBEDTLS_PROMPTLESS + select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY + default y if PSA_CRYPTO_ENABLE_ALL + config ENTROPY_PSA_CRYPTO_RNG select PSA_WANT_GENERATE_RANDOM diff --git a/subsys/nrf_security/Kconfig.tls b/subsys/nrf_security/Kconfig.tls index 9387f168c312..ca19e570d62c 100644 --- a/subsys/nrf_security/Kconfig.tls +++ b/subsys/nrf_security/Kconfig.tls @@ -7,7 +7,7 @@ menuconfig MBEDTLS_X509_LIBRARY bool "Create mbed TLS x509 library" select MBEDTLS_PK_C - default y if MBEDTLS_PSA_CRYPTO_C && (MBEDTLS_ECDSA_C || MBEDTLS_ECDH_C) + default y if PSA_CRYPTO_CLIENT && (MBEDTLS_ECDSA_C || MBEDTLS_ECDH_C) help Create the mbed x509 library for handling of certificates. @@ -123,7 +123,7 @@ config MBEDTLS_SSL_PROTO_TLS1_2 bool "TLS version 1.2 protocol" default y depends on (MBEDTLS_SHA1_C || MBEDTLS_SHA256_C || MBEDTLS_SHA512_C) || \ - MBEDTLS_PSA_CRYPTO_C + PSA_CRYPTO_CLIENT help Enable the TLS 1.2 protocol Corresponds to MBEDTLS_SSL_PROTO_TLS1_2 in mbed TLS config file diff --git a/subsys/nrf_security/cmake/legacy_crypto_config.cmake b/subsys/nrf_security/cmake/legacy_crypto_config.cmake index c47709704846..9514d8e91abb 100644 --- a/subsys/nrf_security/cmake/legacy_crypto_config.cmake +++ b/subsys/nrf_security/cmake/legacy_crypto_config.cmake @@ -271,5 +271,5 @@ kconfig_check_and_set_base_depends(MBEDTLS_SHA224_C ) configure_file(${NRF_SECURITY_ROOT}/configs/legacy_crypto_config.h.template - ${generated_include_path}/${CONFIG_MBEDTLS_CFG_FILE} + ${generated_include_path}/${CONFIG_MBEDTLS_CONFIG_FILE} ) diff --git a/subsys/nrf_security/cmake/nrf_config.cmake b/subsys/nrf_security/cmake/nrf_config.cmake index ceabab970910..9af10a796242 100644 --- a/subsys/nrf_security/cmake/nrf_config.cmake +++ b/subsys/nrf_security/cmake/nrf_config.cmake @@ -169,5 +169,5 @@ kconfig_check_and_set_base(MBEDTLS_PSA_CRYPTO_CONFIG) # Generate the Mbed TLS config file (default nrf-config.h) configure_file(${NRF_SECURITY_ROOT}/configs/nrf-config.h.template - ${generated_include_path}/${CONFIG_MBEDTLS_CFG_FILE} + ${generated_include_path}/${CONFIG_MBEDTLS_CONFIG_FILE} ) diff --git a/subsys/nrf_security/configs/config_extra.cmake.in b/subsys/nrf_security/configs/config_extra.cmake.in index eb0e91f2d3a8..ccd855195b96 100644 --- a/subsys/nrf_security/configs/config_extra.cmake.in +++ b/subsys/nrf_security/configs/config_extra.cmake.in @@ -19,7 +19,7 @@ set(NRF_DIR ${NRF_DIR} CACHE STRING "N set(TFM_BOARDS_NRF_DIR ${NRF_DIR}/modules/trusted-firmware-m/tfm_boards CACHE STRING "tfm_boards folder") # This file is populated with the Mbed TLS config file names -set(MBEDTLS_CONFIG_FILE ${CONFIG_MBEDTLS_CFG_FILE} CACHE STRING "Mbed TLS Config file") +set(MBEDTLS_CONFIG_FILE ${CONFIG_MBEDTLS_CONFIG_FILE} CACHE STRING "Mbed TLS Config file") set(MBEDTLS_PSA_CRYPTO_CONFIG_FILE ${CONFIG_MBEDTLS_PSA_CRYPTO_CONFIG_FILE} CACHE STRING "PSA Crypto config file (PSA_WANT)") set(MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE ${CONFIG_MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE} CACHE STRING "PSA Crypto config file (PSA_NEED)") diff --git a/subsys/nrf_security/configs/legacy_crypto_config.h.template b/subsys/nrf_security/configs/legacy_crypto_config.h.template index dc3a1fbddec8..cb0fd5d3a841 100644 --- a/subsys/nrf_security/configs/legacy_crypto_config.h.template +++ b/subsys/nrf_security/configs/legacy_crypto_config.h.template @@ -3322,7 +3322,7 @@ * Requires: MBEDTLS_PSA_CRYPTO_C * */ -#cmakedefine MBEDTLS_PSA_STATIC_KEY_SLOTS +//#cmakedefine MBEDTLS_PSA_STATIC_KEY_SLOTS /** * \def MBEDTLS_RIPEMD160_C diff --git a/subsys/nrf_security/src/drivers/Kconfig b/subsys/nrf_security/src/drivers/Kconfig index d1778bbb60d6..afcb18b211a6 100644 --- a/subsys/nrf_security/src/drivers/Kconfig +++ b/subsys/nrf_security/src/drivers/Kconfig @@ -26,7 +26,7 @@ config PSA_CRYPTO_DRIVER_CC3XX config PSA_CRYPTO_DRIVER_CRACEN bool "Cracen PSA driver" - depends on MBEDTLS_PSA_CRYPTO_C + depends on PSA_CRYPTO_CLIENT depends on HAS_HW_NRF_CRACEN # CRACEN uses the k_event_ API select EVENTS if MULTITHREADING diff --git a/subsys/nrf_security/src/utils/nrf_security_utils.cmake b/subsys/nrf_security/src/utils/nrf_security_utils.cmake index 5fca33d8aedb..68784e0abb11 100644 --- a/subsys/nrf_security/src/utils/nrf_security_utils.cmake +++ b/subsys/nrf_security/src/utils/nrf_security_utils.cmake @@ -30,6 +30,10 @@ if(BUILD_INSIDE_TFM) tfm_psa_rot_partition_crypto ) else() + # Ensure that zephyr/heap_constants.h needed by zephyr/kernel.h + # is generated first + add_dependencies(nrf_security_utils zephyr_generated_headers) + # This special linking is done to give access to the zephyr kernel library # which possibly isn't --whole-archived in the build. Trying to link to the # kernel library directly will give cyclic dependency. The only way to avoid diff --git a/subsys/settings/include/settings/settings_zms_legacy.h b/subsys/settings/include/settings/settings_zms_legacy.h index ba8f130a9bd6..bd7503fe3373 100644 --- a/subsys/settings/include/settings/settings_zms_legacy.h +++ b/subsys/settings/include/settings/settings_zms_legacy.h @@ -7,7 +7,7 @@ #ifndef __SETTINGS_ZMS_LEGACY_H_ #define __SETTINGS_ZMS_LEGACY_H_ -#include +#include #include #ifdef __cplusplus diff --git a/subsys/settings/src/settings_zms_legacy.c b/subsys/settings/src/settings_zms_legacy.c index ccfa99b36f6f..5df7e2b8cd25 100644 --- a/subsys/settings/src/settings_zms_legacy.c +++ b/subsys/settings/src/settings_zms_legacy.c @@ -19,9 +19,9 @@ LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL); #if DT_HAS_CHOSEN(zephyr_settings_partition) -#define SETTINGS_PARTITION DT_FIXED_PARTITION_ID(DT_CHOSEN(zephyr_settings_partition)) +#define SETTINGS_PARTITION DT_PARTITION_ID(DT_CHOSEN(zephyr_settings_partition)) #else -#define SETTINGS_PARTITION FIXED_PARTITION_ID(storage_partition) +#define SETTINGS_PARTITION PARTITION_ID(storage_partition) #endif struct settings_zms_read_fn_arg { diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 274193d4acfa..ba159f267c63 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -118,7 +118,7 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) endif() # Calculate the secure board target when building for non-secure board targets - string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") + string(REPLACE "/" ";" split_board_qualifiers ";${BOARD_QUALIFIERS}") list(GET split_board_qualifiers 1 target_soc) if(SB_CONFIG_SOC_SERIES_NRF53 OR SB_CONFIG_SOC_SERIES_NRF54L) diff --git a/sysbuild/appcore.cmake b/sysbuild/appcore.cmake index 4dea27534662..729c644b779d 100644 --- a/sysbuild/appcore.cmake +++ b/sysbuild/appcore.cmake @@ -8,7 +8,7 @@ get_property(PM_DOMAINS GLOBAL PROPERTY PM_DOMAINS) # Include application core image if enabled if(SB_CONFIG_SUPPORT_APPCORE AND NOT SB_CONFIG_APPCORE_NONE AND DEFINED SB_CONFIG_APPCORE_IMAGE_NAME) # Calculate the application board target - string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") + string(REPLACE "/" ";" split_board_qualifiers ";${BOARD_QUALIFIERS}") list(GET split_board_qualifiers 1 target_soc) list(GET split_board_qualifiers 2 target_cpucluster) diff --git a/sysbuild/flprcore.cmake b/sysbuild/flprcore.cmake index f2d68634eef7..7f0c420c213a 100644 --- a/sysbuild/flprcore.cmake +++ b/sysbuild/flprcore.cmake @@ -6,7 +6,7 @@ # Include FLPR core image if enabled if(SB_CONFIG_SUPPORT_FLPRCORE AND NOT SB_CONFIG_FLPRCORE_NONE AND DEFINED SB_CONFIG_FLPRCORE_IMAGE_NAME) # Calculate the FLPR core board target - string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") + string(REPLACE "/" ";" split_board_qualifiers ";${BOARD_QUALIFIERS}") list(GET split_board_qualifiers 1 target_soc) list(GET split_board_qualifiers 2 target_cpucluster) set(board_target_flprcore "${BOARD}/${target_soc}/${SB_CONFIG_FLPRCORE_REMOTE_BOARD_TARGET_CPUCLUSTER}") diff --git a/sysbuild/netcore.cmake b/sysbuild/netcore.cmake index c30dcd26757f..142a41fa5e84 100644 --- a/sysbuild/netcore.cmake +++ b/sysbuild/netcore.cmake @@ -8,7 +8,7 @@ get_property(PM_DOMAINS GLOBAL PROPERTY PM_DOMAINS) # Include network core image if enabled if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE AND DEFINED SB_CONFIG_NETCORE_IMAGE_NAME) # Calculate the network board target - string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") + string(REPLACE "/" ";" split_board_qualifiers ";${BOARD_QUALIFIERS}") list(GET split_board_qualifiers 1 target_soc) list(GET split_board_qualifiers 2 target_cpucluster) set(board_target_netcore "${BOARD}/${target_soc}/${SB_CONFIG_NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER}") diff --git a/sysbuild/pprcore.cmake b/sysbuild/pprcore.cmake index 4e0b1c287ea7..807a4f8a8e1d 100644 --- a/sysbuild/pprcore.cmake +++ b/sysbuild/pprcore.cmake @@ -6,7 +6,7 @@ # Include PPR core image if enabled if(SB_CONFIG_SUPPORT_PPRCORE AND NOT SB_CONFIG_PPRCORE_NONE AND DEFINED SB_CONFIG_PPRCORE_IMAGE_NAME) # Calculate the PPR core board target - string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") + string(REPLACE "/" ";" split_board_qualifiers ";${BOARD_QUALIFIERS}") list(GET split_board_qualifiers 1 target_soc) list(GET split_board_qualifiers 2 target_cpucluster) set(board_target_pprcore "${BOARD}/${target_soc}/${SB_CONFIG_PPRCORE_REMOTE_BOARD_TARGET_CPUCLUSTER}") diff --git a/sysbuild/secureboot.cmake b/sysbuild/secureboot.cmake index 6910a51540bf..7deeaebcf2e4 100644 --- a/sysbuild/secureboot.cmake +++ b/sysbuild/secureboot.cmake @@ -7,7 +7,7 @@ get_property(PM_DOMAINS GLOBAL PROPERTY PM_DOMAINS) if(SB_CONFIG_SECURE_BOOT) if(SB_CONFIG_SECURE_BOOT_NETCORE) # Calculate the network board target - string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") + string(REPLACE "/" ";" split_board_qualifiers ";${BOARD_QUALIFIERS}") list(GET split_board_qualifiers 1 target_soc) list(GET split_board_qualifiers 2 target_cpucluster) diff --git a/tests/benchmarks/current_consumption/rram_write/src/main.c b/tests/benchmarks/current_consumption/rram_write/src/main.c index c866c57d9e9c..bc25e40a00ba 100644 --- a/tests/benchmarks/current_consumption/rram_write/src/main.c +++ b/tests/benchmarks/current_consumption/rram_write/src/main.c @@ -17,7 +17,7 @@ /* TEST_AREA is only defined for configurations that rely on * fixed-partition nodes. */ -#if DT_FIXED_PARTITION_EXISTS(DT_NODELABEL(TEST_AREA)) +#if DT_PARTITION_EXISTS(DT_NODELABEL(TEST_AREA)) #define TEST_AREA_OFFSET DT_PROP_BY_IDX(DT_NODELABEL(TEST_AREA), reg, 0) #define TEST_AREA_SIZE DT_REG_SIZE(DT_NODELABEL(TEST_AREA)) #define TEST_AREA_END (TEST_AREA_OFFSET + TEST_AREA_SIZE) diff --git a/tests/benchmarks/i2s_freq/src/main.c b/tests/benchmarks/i2s_freq/src/main.c index d7dd8836dd1c..63cfafd0a822 100644 --- a/tests/benchmarks/i2s_freq/src/main.c +++ b/tests/benchmarks/i2s_freq/src/main.c @@ -141,12 +141,12 @@ static int configure_stream(const struct device *dev_i2s, enum i2s_dir dir, uint if (dir == I2S_DIR_TX) { /* Configure the Transmit port as Master */ - i2s_cfg.options = I2S_OPT_FRAME_CLK_MASTER | I2S_OPT_BIT_CLK_MASTER; + i2s_cfg.options = I2S_OPT_FRAME_CLK_CONTROLLER | I2S_OPT_BIT_CLK_CONTROLLER; } else if (dir == I2S_DIR_RX) { /* Configure the Receive port as Slave */ - i2s_cfg.options = I2S_OPT_FRAME_CLK_SLAVE | I2S_OPT_BIT_CLK_SLAVE; + i2s_cfg.options = I2S_OPT_FRAME_CLK_TARGET | I2S_OPT_BIT_CLK_TARGET; } else { /* dir == I2S_DIR_BOTH */ - i2s_cfg.options = I2S_OPT_FRAME_CLK_MASTER | I2S_OPT_BIT_CLK_MASTER; + i2s_cfg.options = I2S_OPT_FRAME_CLK_CONTROLLER | I2S_OPT_BIT_CLK_CONTROLLER; } if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) { diff --git a/tests/benchmarks/multicore/idle_gpio/sysbuild/nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi b/tests/benchmarks/multicore/idle_gpio/sysbuild/nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi index df8ad5add77d..6f114482b52a 100644 --- a/tests/benchmarks/multicore/idle_gpio/sysbuild/nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi +++ b/tests/benchmarks/multicore/idle_gpio/sysbuild/nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi @@ -22,7 +22,7 @@ partitions { /* Merged partition used by the MCUboot (variant 0). */ slot0_partition: partition@40000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(656)>; ranges = <0x0 0x40000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -32,18 +32,20 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot0_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio code partition (variant 0). */ cpurad_slot0_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; reg = <0x52000 DT_SIZE_K(328)>; }; }; /* Merged partition used by the MCUboot (variant 1). */ slot1_partition: partition@100000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x100000 DT_SIZE_K(656)>; ranges = <0x0 0x100000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -53,11 +55,13 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot1_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio code partition (variant 1). */ cpurad_slot1_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; reg = <0x52000 DT_SIZE_K(328)>; }; }; diff --git a/tests/benchmarks/peripheral_load/src/i2s_thread.c b/tests/benchmarks/peripheral_load/src/i2s_thread.c index c0726e60bd63..dfcb8fe60230 100644 --- a/tests/benchmarks/peripheral_load/src/i2s_thread.c +++ b/tests/benchmarks/peripheral_load/src/i2s_thread.c @@ -65,15 +65,15 @@ static int configure_stream(const struct device *dev_i2s, enum i2s_dir dir) if (dir == I2S_DIR_TX) { /* Configure the Transmit port as Master */ - i2s_cfg.options = I2S_OPT_FRAME_CLK_MASTER - | I2S_OPT_BIT_CLK_MASTER; + i2s_cfg.options = I2S_OPT_FRAME_CLK_CONTROLLER + | I2S_OPT_BIT_CLK_CONTROLLER; } else if (dir == I2S_DIR_RX) { /* Configure the Receive port as Slave */ - i2s_cfg.options = I2S_OPT_FRAME_CLK_SLAVE - | I2S_OPT_BIT_CLK_SLAVE; + i2s_cfg.options = I2S_OPT_FRAME_CLK_TARGET + | I2S_OPT_BIT_CLK_TARGET; } else { /* dir == I2S_DIR_BOTH */ - i2s_cfg.options = I2S_OPT_FRAME_CLK_MASTER - | I2S_OPT_BIT_CLK_MASTER; + i2s_cfg.options = I2S_OPT_FRAME_CLK_CONTROLLER + | I2S_OPT_BIT_CLK_CONTROLLER; } if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) { diff --git a/tests/bluetooth/tester/mmdl/src/mmdl.c b/tests/bluetooth/tester/mmdl/src/mmdl.c index b719ef3e5e29..5ee6076a385b 100644 --- a/tests/bluetooth/tester/mmdl/src/mmdl.c +++ b/tests/bluetooth/tester/mmdl/src/mmdl.c @@ -1567,7 +1567,7 @@ static void sensor_desc_get(uint8_t *data, uint16_t len) static void sensor_get(uint8_t *data, uint16_t len) { struct mesh_sensor_get *cmd = (void *)data; - const struct bt_mesh_sensor_type *sensor; + const struct bt_mesh_sensor_type *sensor = NULL; struct net_buf_simple *buf = NET_BUF_SIMPLE(BT_MESH_TX_SDU_MAX); struct bt_mesh_sensor_value value[CONFIG_BT_MESH_SENSOR_CHANNELS_MAX]; struct bt_mesh_sensor_data values[5]; diff --git a/tests/drivers/flash/multicore_soc_flash/src/main.c b/tests/drivers/flash/multicore_soc_flash/src/main.c index f937a500bcbd..2d2a516bde74 100644 --- a/tests/drivers/flash/multicore_soc_flash/src/main.c +++ b/tests/drivers/flash/multicore_soc_flash/src/main.c @@ -9,8 +9,8 @@ #include #define TEST_DATA_PARTITION storage_partition -#define TEST_DATA_PARTITION_OFFSET FIXED_PARTITION_OFFSET(TEST_DATA_PARTITION) -#define TEST_DATA_PARTITION_DEVICE FIXED_PARTITION_DEVICE(TEST_DATA_PARTITION) +#define TEST_DATA_PARTITION_OFFSET PARTITION_OFFSET(TEST_DATA_PARTITION) +#define TEST_DATA_PARTITION_DEVICE PARTITION_DEVICE(TEST_DATA_PARTITION) #define FLASH_PAGE_SIZE 4096 #define FLASH_WORD_SIZE 16 diff --git a/tests/drivers/fprotect/storage/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/fprotect/storage/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 81d492dc97d3..4fe548c9c24a 100644 --- a/tests/drivers/fprotect/storage/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/drivers/fprotect/storage/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -16,16 +16,18 @@ reg = <0x0 0x17d000>; partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <0x1>; #size-cells = <0x1>; slot0_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x0 0xd800>; }; storage_partition: partition@175000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x175000 0x8000>; }; diff --git a/tests/drivers/fprotect/storage/src/main.c b/tests/drivers/fprotect/storage/src/main.c index 7581b518159e..789b03a7a3d6 100644 --- a/tests/drivers/fprotect/storage/src/main.c +++ b/tests/drivers/fprotect/storage/src/main.c @@ -13,8 +13,8 @@ #define STORAGE_PARTITION storage_partition -#define STORAGE_AREA_DEVICE FIXED_PARTITION_DEVICE(STORAGE_PARTITION) -#define STORAGE_AREA_ADDRESS FIXED_PARTITION_OFFSET(STORAGE_PARTITION) +#define STORAGE_AREA_DEVICE PARTITION_DEVICE(STORAGE_PARTITION) +#define STORAGE_AREA_ADDRESS PARTITION_OFFSET(STORAGE_PARTITION) BUILD_ASSERT(STORAGE_AREA_ADDRESS % CONFIG_NRF_RRAM_REGION_ADDRESS_RESOLUTION == 0, "storage area isn't properly aligned with protection region"); diff --git a/tests/drivers/i2s/i2s_buffer/src/i2s_buffer.c b/tests/drivers/i2s/i2s_buffer/src/i2s_buffer.c index 1d49bbfda4df..f739ece7d8f8 100644 --- a/tests/drivers/i2s/i2s_buffer/src/i2s_buffer.c +++ b/tests/drivers/i2s/i2s_buffer/src/i2s_buffer.c @@ -61,7 +61,7 @@ static const struct i2s_config default_i2s_cfg = { .frame_clk_freq = 44100U, .block_size = BLOCK_SIZE, .timeout = TIMEOUT, - .options = I2S_OPT_FRAME_CLK_MASTER | I2S_OPT_BIT_CLK_MASTER, + .options = I2S_OPT_FRAME_CLK_CONTROLLER | I2S_OPT_BIT_CLK_CONTROLLER, .mem_slab = &tx_0_mem_slab, }; @@ -147,12 +147,12 @@ static int configure_stream(const struct device *dev, enum i2s_dir dir, if (dir == I2S_DIR_TX) { /* Configure the Transmit port as Master */ - i2s_cfg->options = I2S_OPT_FRAME_CLK_MASTER | I2S_OPT_BIT_CLK_MASTER; + i2s_cfg->options = I2S_OPT_FRAME_CLK_CONTROLLER | I2S_OPT_BIT_CLK_CONTROLLER; } else if (dir == I2S_DIR_RX) { /* Configure the Receive port as Slave */ - i2s_cfg->options = I2S_OPT_FRAME_CLK_SLAVE | I2S_OPT_BIT_CLK_SLAVE; + i2s_cfg->options = I2S_OPT_FRAME_CLK_TARGET | I2S_OPT_BIT_CLK_TARGET; } else { /* dir == I2S_DIR_BOTH */ - i2s_cfg->options = I2S_OPT_FRAME_CLK_MASTER | I2S_OPT_BIT_CLK_MASTER; + i2s_cfg->options = I2S_OPT_FRAME_CLK_CONTROLLER | I2S_OPT_BIT_CLK_CONTROLLER; } if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) { diff --git a/tests/drivers/i2s/i2s_instances/src/i2s_instances.c b/tests/drivers/i2s/i2s_instances/src/i2s_instances.c index 0e5f81bdebdb..67aec7ca1f74 100644 --- a/tests/drivers/i2s/i2s_instances/src/i2s_instances.c +++ b/tests/drivers/i2s/i2s_instances/src/i2s_instances.c @@ -129,8 +129,8 @@ static void test_transmit_any_data_instance(const struct device *dev) i2s_cfg.frame_clk_freq = FRAME_CLK_FREQ; i2s_cfg.block_size = BLOCK_SIZE; i2s_cfg.timeout = TIMEOUT; - i2s_cfg.options = I2S_OPT_FRAME_CLK_MASTER - | I2S_OPT_BIT_CLK_MASTER | I2S_OPT_BIT_CLK_GATED; + i2s_cfg.options = I2S_OPT_FRAME_CLK_CONTROLLER + | I2S_OPT_BIT_CLK_CONTROLLER | I2S_OPT_BIT_CLK_GATED; i2s_cfg.mem_slab = &tx_0_mem_slab; ret = i2s_configure(dev, I2S_DIR_TX, &i2s_cfg); diff --git a/tests/drivers/i2s/i2s_latency/src/main.c b/tests/drivers/i2s/i2s_latency/src/main.c index 19f4652f0555..bb0ab28fbcfe 100644 --- a/tests/drivers/i2s/i2s_latency/src/main.c +++ b/tests/drivers/i2s/i2s_latency/src/main.c @@ -129,7 +129,7 @@ static void configure_i2s(const struct device *dev, uint32_t frame_clk_freq) i2s_cfg.frame_clk_freq = frame_clk_freq; i2s_cfg.block_size = BLOCK_SIZE; i2s_cfg.timeout = TIMEOUT_MS; - i2s_cfg.options = I2S_OPT_FRAME_CLK_MASTER | I2S_OPT_BIT_CLK_MASTER; + i2s_cfg.options = I2S_OPT_FRAME_CLK_CONTROLLER | I2S_OPT_BIT_CLK_CONTROLLER; i2s_cfg.mem_slab = &tx_mem_slab; ret = i2s_configure(i2s_dev, I2S_DIR_TX, &i2s_cfg); diff --git a/tests/drivers/i2s/i2s_mclk/src/test_i2s_mclk.c b/tests/drivers/i2s/i2s_mclk/src/test_i2s_mclk.c index 7f0cc0ab33e3..a8435396c641 100644 --- a/tests/drivers/i2s/i2s_mclk/src/test_i2s_mclk.c +++ b/tests/drivers/i2s/i2s_mclk/src/test_i2s_mclk.c @@ -163,15 +163,15 @@ static int configure_stream(const struct device *dev_i2s, enum i2s_dir dir) if (dir == I2S_DIR_TX) { /* Configure the Transmit port as Master */ - i2s_cfg.options = I2S_OPT_FRAME_CLK_MASTER - | I2S_OPT_BIT_CLK_MASTER | I2S_OPT_BIT_CLK_GATED; + i2s_cfg.options = I2S_OPT_FRAME_CLK_CONTROLLER + | I2S_OPT_BIT_CLK_CONTROLLER | I2S_OPT_BIT_CLK_GATED; } else if (dir == I2S_DIR_RX) { /* Configure the Receive port as Slave */ - i2s_cfg.options = I2S_OPT_FRAME_CLK_SLAVE - | I2S_OPT_BIT_CLK_SLAVE | I2S_OPT_BIT_CLK_GATED; + i2s_cfg.options = I2S_OPT_FRAME_CLK_TARGET + | I2S_OPT_BIT_CLK_TARGET | I2S_OPT_BIT_CLK_GATED; } else { /* dir == I2S_DIR_BOTH */ - i2s_cfg.options = I2S_OPT_FRAME_CLK_MASTER - | I2S_OPT_BIT_CLK_MASTER | I2S_OPT_BIT_CLK_GATED; + i2s_cfg.options = I2S_OPT_FRAME_CLK_CONTROLLER + | I2S_OPT_BIT_CLK_CONTROLLER | I2S_OPT_BIT_CLK_GATED; } if (!IS_ENABLED(CONFIG_TEST_USE_GPIO_LOOPBACK)) { diff --git a/tests/drivers/i2s/i2s_pan/src/main.c b/tests/drivers/i2s/i2s_pan/src/main.c index 4f148f26e651..2f8581e52a5a 100644 --- a/tests/drivers/i2s/i2s_pan/src/main.c +++ b/tests/drivers/i2s/i2s_pan/src/main.c @@ -64,7 +64,7 @@ ZTEST(i2s_pan, test_hmpan_46_workaround) i2s_cfg.frame_clk_freq = 44100; i2s_cfg.block_size = BLOCK_SIZE; i2s_cfg.timeout = TIMEOUT_MS; - i2s_cfg.options = I2S_OPT_FRAME_CLK_MASTER | I2S_OPT_BIT_CLK_MASTER; + i2s_cfg.options = I2S_OPT_FRAME_CLK_CONTROLLER | I2S_OPT_BIT_CLK_CONTROLLER; i2s_cfg.mem_slab = &tx_mem_slab; ret = i2s_configure(i2s_dev, I2S_DIR_TX, &i2s_cfg); @@ -143,7 +143,7 @@ ZTEST(i2s_pan, test_hmpan_146_not_observed) .frame_clk_freq = 44100U, .block_size = BLOCK_SIZE, .timeout = TIMEOUT_MS, - .options = I2S_OPT_FRAME_CLK_MASTER | I2S_OPT_BIT_CLK_MASTER, + .options = I2S_OPT_FRAME_CLK_CONTROLLER | I2S_OPT_BIT_CLK_CONTROLLER, }; const uint8_t offest_1 = 11; const uint8_t offest_2 = 22; diff --git a/tests/drivers/i2s/i2s_samplerate/src/test_i2s_samplerate.c b/tests/drivers/i2s/i2s_samplerate/src/test_i2s_samplerate.c index 8aac9c45fdd2..6058a9743eab 100644 --- a/tests/drivers/i2s/i2s_samplerate/src/test_i2s_samplerate.c +++ b/tests/drivers/i2s/i2s_samplerate/src/test_i2s_samplerate.c @@ -125,7 +125,7 @@ static const struct i2s_config default_i2s_cfg = { .frame_clk_freq = 44100U, .block_size = BLOCK_SIZE, .timeout = TIMEOUT, - .options = I2S_OPT_FRAME_CLK_MASTER | I2S_OPT_BIT_CLK_MASTER, + .options = I2S_OPT_FRAME_CLK_CONTROLLER | I2S_OPT_BIT_CLK_CONTROLLER, .mem_slab = &tx_0_mem_slab, }; @@ -166,12 +166,12 @@ static int configure_stream(const struct device *dev, enum i2s_dir dir, struct i if (dir == I2S_DIR_TX) { /* Configure the Transmit port as Master */ - i2s_cfg->options = I2S_OPT_FRAME_CLK_MASTER | I2S_OPT_BIT_CLK_MASTER; + i2s_cfg->options = I2S_OPT_FRAME_CLK_CONTROLLER | I2S_OPT_BIT_CLK_CONTROLLER; } else if (dir == I2S_DIR_RX) { /* Configure the Receive port as Slave */ - i2s_cfg->options = I2S_OPT_FRAME_CLK_SLAVE | I2S_OPT_BIT_CLK_SLAVE; + i2s_cfg->options = I2S_OPT_FRAME_CLK_TARGET | I2S_OPT_BIT_CLK_TARGET; } else { /* dir == I2S_DIR_BOTH */ - i2s_cfg->options = I2S_OPT_FRAME_CLK_MASTER | I2S_OPT_BIT_CLK_MASTER; + i2s_cfg->options = I2S_OPT_FRAME_CLK_CONTROLLER | I2S_OPT_BIT_CLK_CONTROLLER; } if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) { diff --git a/tests/lib/hw_unique_key/boards/nrf52840dk_nrf52840.overlay b/tests/lib/hw_unique_key/boards/nrf52840dk_nrf52840.overlay index 27fb824cb80e..0d4092a94352 100644 --- a/tests/lib/hw_unique_key/boards/nrf52840dk_nrf52840.overlay +++ b/tests/lib/hw_unique_key/boards/nrf52840dk_nrf52840.overlay @@ -3,11 +3,13 @@ &flash0 { partitions { storage_partition: partition@fd000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000fd000 0x00002000>; }; hw_unique_key_partition: partition@ff000 { + compatible = "zephyr,mapped-partition"; label = ""; reg = <0x000ff000 0x00001000>; }; diff --git a/tests/lib/hw_unique_key/src/main.c b/tests/lib/hw_unique_key/src/main.c index 54c29ef0681c..ea07818c14f1 100644 --- a/tests/lib/hw_unique_key/src/main.c +++ b/tests/lib/hw_unique_key/src/main.c @@ -136,7 +136,7 @@ static void do_key_test(void) zassert_equal(0, err, "unexpected error: %d\n", err); zassert_mem_equal(expected_key, out_key, sizeof(expected_key), NULL); -#if defined(PM_HW_UNIQUE_KEY_PARTITION_ADDRESS) || FIXED_PARTITION_EXISTS(hw_unique_key_partition) +#if defined(PM_HW_UNIQUE_KEY_PARTITION_ADDRESS) || PARTITION_EXISTS(hw_unique_key_partition) state = STATE_TEST_INVALID; expected_fatal++; #ifdef CONFIG_PARTITION_MANAGER_ENABLED @@ -144,7 +144,7 @@ static void do_key_test(void) zassert_equal(0, *(uint32_t *)PM_HW_UNIQUE_KEY_PARTITION_ADDRESS, NULL); #else /* The following causes an exception */ - zassert_equal(0, *(uint32_t *)FIXED_PARTITION_ADDRESS( + zassert_equal(0, *(uint32_t *)PARTITION_ADDRESS( hw_unique_key_partition), NULL); #endif #else diff --git a/tests/lib/location/CMakeLists.txt b/tests/lib/location/CMakeLists.txt index ac0d868bc7ca..c6c4b9743d95 100644 --- a/tests/lib/location/CMakeLists.txt +++ b/tests/lib/location/CMakeLists.txt @@ -41,6 +41,7 @@ cmock_handle(${ZEPHYR_BASE}/include/zephyr/net/net_if.h FUNC_EXCLUDE ".*net_if_add_tx_timestamp" FUNC_EXCLUDE ".*net_if_ipv4_get_netmask" FUNC_EXCLUDE ".*net_if_ipv4_set_netmask" + FUNC_EXCLUDE ".*net_if_offload_set" WORD_EXCLUDE ".*deprecated.*" WORD_EXCLUDE ".*net_if_send_data.*" WORD_EXCLUDE ".*net_if_try_send_data.*" diff --git a/tests/lib/nrf_modem_lib/trace_backends/flash/boards/native_sim.overlay b/tests/lib/nrf_modem_lib/trace_backends/flash/boards/native_sim.overlay index feca743add1b..6ee8b2e8be84 100644 --- a/tests/lib/nrf_modem_lib/trace_backends/flash/boards/native_sim.overlay +++ b/tests/lib/nrf_modem_lib/trace_backends/flash/boards/native_sim.overlay @@ -6,7 +6,7 @@ &flash0 { partitions { - compatible = "fixed-partitions"; + ranges; #address-cells = <1>; #size-cells = <1>; @@ -17,6 +17,7 @@ /* modem_trace partition - matches flash backend without partition manager */ modem_trace: partition@75000 { + compatible = "zephyr,mapped-partition"; label = "modem_trace"; reg = <0x00075000 0x00010000>; /* 64KB */ }; diff --git a/tests/lib/ram_pwrdn/prj.conf b/tests/lib/ram_pwrdn/prj.conf index fe832e7432f9..c891b7310065 100644 --- a/tests/lib/ram_pwrdn/prj.conf +++ b/tests/lib/ram_pwrdn/prj.conf @@ -5,7 +5,4 @@ # CONFIG_ZTEST=y -CONFIG_NEWLIB_LIBC=y -CONFIG_NEWLIB_LIBC_NANO=n CONFIG_RAM_POWER_DOWN_LIBRARY=y -CONFIG_RAM_POWER_ADJUST_ON_HEAP_RESIZE=y diff --git a/tests/lib/ram_pwrdn/src/main.c b/tests/lib/ram_pwrdn/src/main.c index 6c2603353b2d..c9570db02d20 100644 --- a/tests/lib/ram_pwrdn/src/main.c +++ b/tests/lib/ram_pwrdn/src/main.c @@ -50,29 +50,6 @@ static bool check_section_range(struct bank_section first, struct bank_section l return true; } -static bool get_first_down_section(struct bank_section *out) -{ - bool down_section_found = false; - - for (uint8_t bank_id = 0; bank_id <= 8; ++bank_id) { - for (uint8_t sect_id = 0; sect_id < (bank_id == 8 ? 6 : 2); ++sect_id) { - bool is_up = check_section_up(bank_id, sect_id); - - if (is_up && down_section_found) { - return false; - } - - if (!is_up && !down_section_found) { - out->bank_id = bank_id; - out->sect_id = sect_id; - down_section_found = true; - } - } - } - - return down_section_found; -} - static void teardown(void *f) { const uintptr_t RAM_START_ADDR = 0x20000000UL; @@ -83,43 +60,6 @@ static void teardown(void *f) /* ===== Test cases ===== */ -/* - * Use a global extern pointer to hold the allocated buffer to prevent the - * compiler from optimizing away malloc()/free(). - */ -void *allocated_buffer; - -ZTEST(ram_pwrdn, test_heap_resize) -{ - const size_t buffer_size = 20480; // 20KiB - - struct bank_section limit; - struct bank_section limit_saved; - - /* Save the current limit between powered up and down RAM areas */ - zassert_true(get_first_down_section(&limit_saved), "Enabled RAM limit not found"); - - /* Allocate some memory and verify that the limit has moved forward */ - allocated_buffer = malloc(buffer_size); - memset(allocated_buffer, 0, buffer_size); - - zassert_true(get_first_down_section(&limit), "Enabled RAM limit not found after malloc"); - zassert_true(limit.bank_id > limit_saved.bank_id || (limit.bank_id == limit_saved.bank_id && - limit.sect_id > limit_saved.sect_id), - "Enabled RAM limit not moved forward after malloc"); - - /* Trim memory and verify that the limit has moved backward */ - free(allocated_buffer); - malloc_trim(0); - limit_saved.bank_id = limit.bank_id; - limit_saved.sect_id = limit.sect_id; - - zassert_true(get_first_down_section(&limit), "Enabled RAM limit not found after malloc"); - zassert_true(limit.bank_id < limit_saved.bank_id || (limit.bank_id == limit_saved.bank_id && - limit.sect_id < limit_saved.sect_id), - "Enabled RAM limit not moved backward after malloc"); -} - ZTEST(ram_pwrdn, test_manual_power_control) { const uintptr_t RAM_START_ADDR = 0x20000000UL; diff --git a/tests/subsys/bootloader/b0_lock_rwx/src/main.c b/tests/subsys/bootloader/b0_lock_rwx/src/main.c index bf5e2eedca7c..fe8e8c505dd7 100644 --- a/tests/subsys/bootloader/b0_lock_rwx/src/main.c +++ b/tests/subsys/bootloader/b0_lock_rwx/src/main.c @@ -34,15 +34,15 @@ #define RWX_SKIP_SIZE CONFIG_SB_IMAGE_BOOT_OFFSET #if RRAMC_REGION_FOR_TEST == B0_RRAMC_REGION -#define RRAMC_REGION_FOR_TEST_SIZE FIXED_PARTITION_SIZE(b0_partition) -#define RRAM_REGION_FOR_TEST_ADDRESS FIXED_PARTITION_OFFSET(b0_partition) +#define RRAMC_REGION_FOR_TEST_SIZE PARTITION_SIZE(b0_partition) +#define RRAM_REGION_FOR_TEST_ADDRESS PARTITION_OFFSET(b0_partition) #elif RRAMC_REGION_FOR_TEST == MCUBOOT_RRAMC_REGION #if !defined(CONFIG_TEST_B0_LOCK_USE_S1) -#define RRAMC_REGION_FOR_TEST_SIZE (FIXED_PARTITION_SIZE(s0_partition) - RWX_SKIP_SIZE) -#define RRAM_REGION_FOR_TEST_ADDRESS (FIXED_PARTITION_OFFSET(s0_partition) + RWX_SKIP_SIZE) +#define RRAMC_REGION_FOR_TEST_SIZE (PARTITION_SIZE(s0_partition) - RWX_SKIP_SIZE) +#define RRAM_REGION_FOR_TEST_ADDRESS (PARTITION_OFFSET(s0_partition) + RWX_SKIP_SIZE) #else -#define RRAMC_REGION_FOR_TEST_SIZE (FIXED_PARTITION_SIZE(s1_partition) - RWX_SKIP_SIZE) -#define RRAM_REGION_FOR_TEST_ADDRESS (FIXED_PARTITION_OFFSET(s1_partition) + RWX_SKIP_SIZE) +#define RRAMC_REGION_FOR_TEST_SIZE (PARTITION_SIZE(s1_partition) - RWX_SKIP_SIZE) +#define RRAM_REGION_FOR_TEST_ADDRESS (PARTITION_OFFSET(s1_partition) + RWX_SKIP_SIZE) #endif #endif #endif diff --git a/tests/subsys/bootloader/b0_ram_cleanup/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/subsys/bootloader/b0_ram_cleanup/boards/nrf54l15dk_nrf54l15_cpuapp.overlay deleted file mode 100644 index 9122e6f29aed..000000000000 --- a/tests/subsys/bootloader/b0_ram_cleanup/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include "../nrf54l15dk_nrf54l15_cpuapp_common.dtsi" diff --git a/tests/subsys/bootloader/b0_ram_cleanup/modules/b0_cleanup_ram_test_prepare/src/b0_cleanup_ram_test_prepare.c b/tests/subsys/bootloader/b0_ram_cleanup/modules/b0_cleanup_ram_test_prepare/src/b0_cleanup_ram_test_prepare.c index 7c3878c6df54..ce8219717423 100644 --- a/tests/subsys/bootloader/b0_ram_cleanup/modules/b0_cleanup_ram_test_prepare/src/b0_cleanup_ram_test_prepare.c +++ b/tests/subsys/bootloader/b0_ram_cleanup/modules/b0_cleanup_ram_test_prepare/src/b0_cleanup_ram_test_prepare.c @@ -9,7 +9,6 @@ #include #include #include -#include #define CLEANUP_RAM_GAP_START ((uint32_t)__ramfunc_start) #define CLEANUP_RAM_GAP_END ((uint32_t) __ramfunc_end) @@ -34,8 +33,6 @@ #define RAMFUNC_START_SAVE_REGISTER NRF_TIMER00->CC[0] #define RAMFUNC_END_SAVE_REGISTER NRF_TIMER00->CC[1] -#define RETAINED_DATA "RETAINED" - static int populate_ram(void) { RAMFUNC_START_SAVE_REGISTER = CLEANUP_RAM_GAP_START; @@ -55,15 +52,6 @@ static int populate_ram(void) printk("Retained memory device is not ready"); return -ENODEV; } - - retained_size = retained_mem_size(retained_mem_dev); - - if (retained_size < strlen(RETAINED_DATA)) { - printk("Retained memory size is too small"); - return -EINVAL; - } - - retained_mem_write(retained_mem_dev, 0, RETAINED_DATA, strlen(RETAINED_DATA)); #endif return 0; } diff --git a/tests/subsys/bootloader/b0_ram_cleanup/nrf54l15dk_nrf54l15_cpuapp_common.dtsi b/tests/subsys/bootloader/b0_ram_cleanup/nrf54l15dk_nrf54l15_cpuapp_common.dtsi deleted file mode 100644 index ae7cd88ec281..000000000000 --- a/tests/subsys/bootloader/b0_ram_cleanup/nrf54l15dk_nrf54l15_cpuapp_common.dtsi +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - cpuapp_sram@2003fff0 { - compatible = "zephyr,memory-region", "mmio-sram"; - reg = <0x2003fff0 0x10>; - zephyr,memory-region = "RetainedMem"; - status = "okay"; - - retainedmem { - compatible = "zephyr,retained-ram"; - status = "okay"; - #address-cells = <1>; - #size-cells = <1>; - - test_retention_area: test_retention_area@0 { - compatible = "zephyr,retention"; - status = "okay"; - reg = <0x0 0x10>; - prefix = [0b 01]; - checksum = <4>; - }; - }; - }; -}; diff --git a/tests/subsys/bootloader/b0_ram_cleanup/prj.conf b/tests/subsys/bootloader/b0_ram_cleanup/prj.conf index 3fca32af7277..43c9454c883c 100644 --- a/tests/subsys/bootloader/b0_ram_cleanup/prj.conf +++ b/tests/subsys/bootloader/b0_ram_cleanup/prj.conf @@ -6,7 +6,3 @@ CONFIG_ZTEST=y CONFIG_ARM_MPU=n CONFIG_SOC_EARLY_RESET_HOOK=y - -CONFIG_RETAINED_MEM=y -CONFIG_RETAINED_MEM_ZEPHYR_RAM=y -CONFIG_RETAINED_MEM_NRF_GPREGRET=n diff --git a/tests/subsys/bootloader/b0_ram_cleanup/src/main.c b/tests/subsys/bootloader/b0_ram_cleanup/src/main.c index 0f0be03c0841..024ef8b2a1a9 100644 --- a/tests/subsys/bootloader/b0_ram_cleanup/src/main.c +++ b/tests/subsys/bootloader/b0_ram_cleanup/src/main.c @@ -6,7 +6,6 @@ #include #include -#include /* As peripheral registers are not cleared during RAM cleanup, we can * use a register of a peripheral unused by NSIB to save data which can then @@ -29,8 +28,6 @@ static uint32_t __noinit ram_cleanup_result; static uint32_t __noinit uncleared_address; static uint32_t __noinit uncleared_value; -#define EXPECTED_RETAINED_DATA "RETAINED" - /** * This hook needs to have the attribute __attribute__((naked)), * as otherwise the stack would be modified when calling it, leading to @@ -126,24 +123,6 @@ ZTEST(b0_ram_cleanup, test_ram_cleanup) zassert_equal(ram_cleanup_result, RAM_CLEANUP_SUCCESS_MAGIC, "Uncleared word detected at address %p, value 0x%x", (void *) uncleared_address, uncleared_value); - -#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_retained_ram) - const struct device *retained_mem_dev = - DEVICE_DT_GET(DT_INST(0, zephyr_retained_ram)); - size_t retained_size; - uint8_t buffer[strlen(EXPECTED_RETAINED_DATA)+1]; - - zassert_true(device_is_ready(retained_mem_dev), "Retained memory device is not ready"); - - retained_size = retained_mem_size(retained_mem_dev); - - zassert_true(retained_size >= strlen(EXPECTED_RETAINED_DATA), - "Retained memory size is too small"); - - retained_mem_read(retained_mem_dev, 0, buffer, strlen(EXPECTED_RETAINED_DATA)); - zassert_mem_equal(buffer, EXPECTED_RETAINED_DATA, strlen(EXPECTED_RETAINED_DATA), - "Retained data is not correct"); -#endif } ZTEST_SUITE(b0_ram_cleanup, NULL, NULL, NULL, NULL, NULL); diff --git a/tests/subsys/bootloader/b0_ram_cleanup/sysbuild/b0.conf b/tests/subsys/bootloader/b0_ram_cleanup/sysbuild/b0.conf index f0e45385da95..03dd779ca2f1 100644 --- a/tests/subsys/bootloader/b0_ram_cleanup/sysbuild/b0.conf +++ b/tests/subsys/bootloader/b0_ram_cleanup/sysbuild/b0.conf @@ -5,6 +5,3 @@ # CONFIG_SB_CLEANUP_RAM=y -CONFIG_RETAINED_MEM=y -CONFIG_RETAINED_MEM_ZEPHYR_RAM=y -CONFIG_RETAINED_MEM_NRF_GPREGRET=n diff --git a/tests/subsys/bootloader/b0_ram_cleanup/sysbuild/b0.overlay b/tests/subsys/bootloader/b0_ram_cleanup/sysbuild/b0.overlay deleted file mode 100644 index 9122e6f29aed..000000000000 --- a/tests/subsys/bootloader/b0_ram_cleanup/sysbuild/b0.overlay +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include "../nrf54l15dk_nrf54l15_cpuapp_common.dtsi" diff --git a/tests/subsys/bootloader/upgrade/ref_smp_svr/sysbuild/mcuboot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.conf b/tests/subsys/bootloader/upgrade/ref_smp_svr/sysbuild/mcuboot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.conf index 1cda90f4ff6d..a1da1b5ecaeb 100644 --- a/tests/subsys/bootloader/upgrade/ref_smp_svr/sysbuild/mcuboot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.conf +++ b/tests/subsys/bootloader/upgrade/ref_smp_svr/sysbuild/mcuboot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.conf @@ -1,2 +1,3 @@ CONFIG_BOOT_WATCHDOG_FEED=n CONFIG_FPROTECT=n +CONFIG_ENTROPY_PSA_CRYPTO_RNG=n diff --git a/tests/subsys/bootloader/upgrade/ref_smp_svr/sysbuild/nrf54h20dk_nrf54h20_memory_map_direct_xip.dtsi b/tests/subsys/bootloader/upgrade/ref_smp_svr/sysbuild/nrf54h20dk_nrf54h20_memory_map_direct_xip.dtsi index df8ad5add77d..6f114482b52a 100644 --- a/tests/subsys/bootloader/upgrade/ref_smp_svr/sysbuild/nrf54h20dk_nrf54h20_memory_map_direct_xip.dtsi +++ b/tests/subsys/bootloader/upgrade/ref_smp_svr/sysbuild/nrf54h20dk_nrf54h20_memory_map_direct_xip.dtsi @@ -22,7 +22,7 @@ partitions { /* Merged partition used by the MCUboot (variant 0). */ slot0_partition: partition@40000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(656)>; ranges = <0x0 0x40000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -32,18 +32,20 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot0_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio code partition (variant 0). */ cpurad_slot0_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; reg = <0x52000 DT_SIZE_K(328)>; }; }; /* Merged partition used by the MCUboot (variant 1). */ slot1_partition: partition@100000 { - compatible = "fixed-subpartitions"; + compatible = "zephyr,mapped-partition"; reg = <0x100000 DT_SIZE_K(656)>; ranges = <0x0 0x100000 DT_SIZE_K(656)>; #address-cells = <1>; @@ -53,11 +55,13 @@ * Offset by the MCUboot header size (2048 bytes). */ cpuapp_slot1_partition: partition@800 { + compatible = "zephyr,mapped-partition"; reg = <0x800 DT_SIZE_K(326)>; }; /* Radio code partition (variant 1). */ cpurad_slot1_partition: partition@52000 { + compatible = "zephyr,mapped-partition"; reg = <0x52000 DT_SIZE_K(328)>; }; }; diff --git a/tests/subsys/dfu/dfu_extra/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/subsys/dfu/dfu_extra/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 2dcf4cab5ab2..ac80ac43bd91 100644 --- a/tests/subsys/dfu/dfu_extra/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/subsys/dfu/dfu_extra/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -15,21 +15,25 @@ partitions { boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; label = "mcuboot"; reg = <0x00000000 0x00020000>; }; slot0_partition: partition@20000 { + compatible = "zephyr,mapped-partition"; label = "image-0"; reg = <0x00020000 0x00040000>; }; slot2_partition: partition@60000 { + compatible = "zephyr,mapped-partition"; label = "image-2"; reg = <0x00060000 0x00020000>; }; storage_partition: partition@80000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x00080000 0x00002000>; }; diff --git a/tests/subsys/dfu/dfu_extra/src/main.c b/tests/subsys/dfu/dfu_extra/src/main.c index ea83bb3b3911..f0f2018be80e 100644 --- a/tests/subsys/dfu/dfu_extra/src/main.c +++ b/tests/subsys/dfu/dfu_extra/src/main.c @@ -107,14 +107,14 @@ int main(void) PM_MCUBOOT_PRIMARY_2_SIZE); #else print_image_content("Extra Image 1", - FIXED_PARTITION_ID(slot2_partition), - FIXED_PARTITION_ADDRESS(slot2_partition), - FIXED_PARTITION_SIZE(slot2_partition)); + PARTITION_ID(slot2_partition), + PARTITION_ADDRESS(slot2_partition), + PARTITION_SIZE(slot2_partition)); print_image_content("Extra Image 2", - FIXED_PARTITION_ID(slot4_partition), - FIXED_PARTITION_ADDRESS(slot4_partition), - FIXED_PARTITION_SIZE(slot4_partition)); + PARTITION_ID(slot4_partition), + PARTITION_ADDRESS(slot4_partition), + PARTITION_SIZE(slot4_partition)); #endif printk("\nDone\n"); diff --git a/tests/subsys/emds/emds_api/boards/nrf52840dk_nrf52840.overlay b/tests/subsys/emds/emds_api/boards/nrf52840dk_nrf52840.overlay index 0f7c0c533489..e7d0adebd914 100644 --- a/tests/subsys/emds/emds_api/boards/nrf52840dk_nrf52840.overlay +++ b/tests/subsys/emds/emds_api/boards/nrf52840dk_nrf52840.overlay @@ -3,16 +3,19 @@ &flash0 { partitions { storage_partition: partition@fc000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000fc000 0x00002000>; }; emds_partition_0: partition@fe000 { + compatible = "zephyr,mapped-partition"; label = "emds-0"; reg = <0x000fe000 0x00001000>; }; emds_partition_1: partition@ff000 { + compatible = "zephyr,mapped-partition"; label = "emds-1"; reg = <0x000ff000 0x00001000>; }; diff --git a/tests/subsys/emds/emds_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/subsys/emds/emds_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 4718b3d2f1b4..5c63094dd5dd 100644 --- a/tests/subsys/emds/emds_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/subsys/emds/emds_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -3,16 +3,19 @@ &cpuapp_rram { partitions { storage_partition: partition@15c000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x15c000 0x2000>; }; emds_partition_0: partition@15e000 { + compatible = "zephyr,mapped-partition"; label = "emds-0"; reg = <0x0015e000 0x00001000>; }; emds_partition_1: partition@15f000 { + compatible = "zephyr,mapped-partition"; label = "emds-1"; reg = <0x0015f000 0x00001000>; }; diff --git a/tests/subsys/emds/emds_flash/boards/nrf52840dk_nrf52840.overlay b/tests/subsys/emds/emds_flash/boards/nrf52840dk_nrf52840.overlay index 0f7c0c533489..e7d0adebd914 100644 --- a/tests/subsys/emds/emds_flash/boards/nrf52840dk_nrf52840.overlay +++ b/tests/subsys/emds/emds_flash/boards/nrf52840dk_nrf52840.overlay @@ -3,16 +3,19 @@ &flash0 { partitions { storage_partition: partition@fc000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000fc000 0x00002000>; }; emds_partition_0: partition@fe000 { + compatible = "zephyr,mapped-partition"; label = "emds-0"; reg = <0x000fe000 0x00001000>; }; emds_partition_1: partition@ff000 { + compatible = "zephyr,mapped-partition"; label = "emds-1"; reg = <0x000ff000 0x00001000>; }; diff --git a/tests/subsys/emds/emds_flash/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/subsys/emds/emds_flash/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 4718b3d2f1b4..5c63094dd5dd 100644 --- a/tests/subsys/emds/emds_flash/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/subsys/emds/emds_flash/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -3,16 +3,19 @@ &cpuapp_rram { partitions { storage_partition: partition@15c000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x15c000 0x2000>; }; emds_partition_0: partition@15e000 { + compatible = "zephyr,mapped-partition"; label = "emds-0"; reg = <0x0015e000 0x00001000>; }; emds_partition_1: partition@15f000 { + compatible = "zephyr,mapped-partition"; label = "emds-1"; reg = <0x0015f000 0x00001000>; }; diff --git a/tests/subsys/emds/emds_flash/src/main.c b/tests/subsys/emds/emds_flash/src/main.c index a61dbf1c836e..356cfb4cf14a 100644 --- a/tests/subsys/emds/emds_flash/src/main.c +++ b/tests/subsys/emds/emds_flash/src/main.c @@ -85,8 +85,8 @@ static void microsecond_timer_cleanup(void) /** Local functions ***********************************************************/ static void *emds_flash_setup(void) { - const uint8_t id[] = {FIXED_PARTITION_ID(emds_partition_0), - FIXED_PARTITION_ID(emds_partition_1)}; + const uint8_t id[] = {PARTITION_ID(emds_partition_0), + PARTITION_ID(emds_partition_1)}; for (int i = 0; i < ARRAY_SIZE(id); i++) { zassert_ok(flash_area_open(id[i], &partition[i].fa), "Failed to open flash area %d", diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/subsys/nrf_compress/decompression/mcuboot_update/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index ae32ead3a6c4..f8498cf213b1 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -16,10 +16,12 @@ &mram1x { partitions { cpuapp_slot0_partition: partition@40000 { + compatible = "zephyr,mapped-partition"; reg = <0x40000 DT_SIZE_K(580)>; }; cpuapp_slot1_partition: partition@d1000 { + compatible = "zephyr,mapped-partition"; reg = <0xd1000 DT_SIZE_K(580)>; }; }; diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml b/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml index 06d373dac39e..a6c9fcfc6d4a 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml @@ -23,9 +23,9 @@ EMPTY_2: size: 0x75e000 EMPTY_3: address: 0x100000 - end_address: 0x165000 + end_address: 0x17d000 region: flash_primary - size: 0x65000 + size: 0x7d000 mcuboot: address: 0x0 end_address: 0x11000 diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/src/main.c b/tests/subsys/nrf_compress/decompression/mcuboot_update/src/main.c index 7e0952f99e3d..031310eab913 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/src/main.c +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/src/main.c @@ -25,9 +25,9 @@ LOG_MODULE_REGISTER(mcuboot_update, LOG_LEVEL_DBG); #endif #else #if CONFIG_UPDATE_IMAGE_NUMBER == 0 -#define UPDATE_SLOT_ID DT_FIXED_PARTITION_ID(DT_NODELABEL(slot1_partition)) +#define UPDATE_SLOT_ID DT_PARTITION_ID(DT_NODELABEL(slot1_partition)) #else -#define UPDATE_SLOT_ID DT_FIXED_PARTITION_ID(DT_NODELABEL(slot3_partition)) +#define UPDATE_SLOT_ID DT_PARTITION_ID(DT_NODELABEL(slot3_partition)) #endif #endif diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf index 88e2624981ae..7bfd7ca20eb0 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf @@ -1,7 +1,7 @@ CONFIG_PM=n CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" CONFIG_BOOT_SWAP_SAVE_ENCTLV=n CONFIG_BOOT_ENCRYPT_IMAGE=n diff --git a/tests/subsys/partition_manager/static_pm_file/src/main.c b/tests/subsys/partition_manager/static_pm_file/src/main.c index 9444c535c4b5..a69da3922a23 100644 --- a/tests/subsys/partition_manager/static_pm_file/src/main.c +++ b/tests/subsys/partition_manager/static_pm_file/src/main.c @@ -22,17 +22,17 @@ struct test_partition_t { */ static struct test_partition_t partitions[] = { { - .slot = FIXED_PARTITION_ID(dummy_1), + .slot = PARTITION_ID(dummy_1), .start_address = 0x98000, .size = 0x1000, }, { - .slot = FIXED_PARTITION_ID(dummy_2), + .slot = PARTITION_ID(dummy_2), .start_address = 0x99000, .size = 0x1000, }, { - .slot = FIXED_PARTITION_ID(dummy_3), + .slot = PARTITION_ID(dummy_3), .start_address = 0x9a000, .size = 0x66000, }, diff --git a/tests/tfm/tfm_psa_test/boards/nrf9160dk_nrf9160_ns.overlay b/tests/tfm/tfm_psa_test/boards/nrf9160dk_nrf9160_ns.overlay index 623fcaf49450..774389839921 100644 --- a/tests/tfm/tfm_psa_test/boards/nrf9160dk_nrf9160_ns.overlay +++ b/tests/tfm/tfm_psa_test/boards/nrf9160dk_nrf9160_ns.overlay @@ -7,6 +7,7 @@ compatible = "nordic,nrf-uarte"; current-speed = <115200>; status = "okay"; + hw-flow-control; }; &uart1 { @@ -14,4 +15,5 @@ current-speed = <115200>; /* Set to disabled in application, since TF-M will be using it. */ status = "disabled"; + hw-flow-control; }; diff --git a/tests/tfm/tfm_psa_test/prj.conf b/tests/tfm/tfm_psa_test/prj.conf index c575826f633c..c26c05e6c7ed 100644 --- a/tests/tfm/tfm_psa_test/prj.conf +++ b/tests/tfm/tfm_psa_test/prj.conf @@ -6,6 +6,11 @@ CONFIG_TFM_USE_NS_APP=y +# Disable features resulting in undefined references +# when wrongfully building the Zephyr NS app. +CONFIG_PSA_CRYPTO_SYS_INIT=n +CONFIG_TFM_ALLOW_NON_SECURE_FAULT_HANDLING=n + # Needed for CRYPTO and INITIAL_ATTESTATION CONFIG_MAIN_STACK_SIZE=4096 CONFIG_TFM_CRYPTO_ENGINE_BUF_SIZE=16536 diff --git a/tests/tfm/tfm_regression_test/CMakeLists.txt b/tests/tfm/tfm_regression_test/CMakeLists.txt deleted file mode 100644 index a07396f8bea9..000000000000 --- a/tests/tfm/tfm_regression_test/CMakeLists.txt +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -cmake_minimum_required(VERSION 3.20.0) - -find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) - -project(tfm_regression_test) - -target_sources(app PRIVATE src/main.c) - - -get_target_property(TFM_BINARY_DIR tfm TFM_BINARY_DIR) -get_target_property(TFM_NS_BIN_FILE tfm TFM_NS_BIN_FILE) -get_target_property(TFM_NS_HEX_FILE tfm TFM_NS_HEX_FILE) -get_target_property(TFM_NS_SIGNED_BIN_FILE tfm TFM_NS_SIGNED_BIN_FILE) - -get_target_property(TFM_TOOLCHAIN_PATH tfm TFM_TOOLCHAIN_PATH) -get_target_property(TFM_TOOLCHAIN_PREFIX tfm TFM_TOOLCHAIN_PREFIX) -get_target_property(TFM_TOOLCHAIN_NS_FILE tfm TFM_TOOLCHAIN_NS_FILE) - -set(TFM_TEST_REPO_PATH ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/../tf-m-tests) - -set(TFM_TEST_DIR "${TFM_TEST_REPO_PATH}/tests_reg/test/secure_regression") -set(TFM_TEST_CONFIG_FILE "${TFM_TEST_REPO_PATH}/tests_reg/test/config/config.cmake") - -set_property(TARGET zephyr_property_target - APPEND PROPERTY TFM_CMAKE_OPTIONS - -DCONFIG_TFM_TEST_DIR=${TFM_TEST_DIR} -) - -set_property(TARGET zephyr_property_target - APPEND PROPERTY TFM_CMAKE_OPTIONS - -DCONFIG_TFM_TEST_CONFIG_FILE=${TFM_TEST_CONFIG_FILE} -) - -# Install t_cose - -file(COPY ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/lib/ext/t_cose - DESTINATION ${TFM_BINARY_DIR}/api_ns) - -# Initial attestation headers are needed for the tests -set(TFM_SECURE_FW_SRC_DIR ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/secure_fw) -file(COPY ${TFM_SECURE_FW_SRC_DIR}/partitions/initial_attestation - DESTINATION ${TFM_BINARY_DIR}/api_ns - FILES_MATCHING PATTERN "*.h") - -file(COPY ${TFM_SECURE_FW_SRC_DIR}/spm/include/boot/tfm_boot_status.h - DESTINATION ${TFM_BINARY_DIR}/api_ns/initial_attestation) - - -include(ExternalProject) - -ExternalProject_Add(tfm_regression_test_app - SOURCE_DIR ${TFM_TEST_REPO_PATH}/tests_reg - BINARY_DIR ${PROJECT_BINARY_DIR}/tfm_ns - CONFIGURE_COMMAND - ${CMAKE_COMMAND} - -G ${CMAKE_GENERATOR} - -S ${TFM_TEST_REPO_PATH}/tests_reg - -B ${PROJECT_BINARY_DIR}/tfm_ns - -DCONFIG_SPE_PATH=${TFM_BINARY_DIR}/api_ns - -DTFM_TOOLCHAIN_FILE=cmake/${TFM_TOOLCHAIN_NS_FILE} - -DCROSS_COMPILE=${TFM_TOOLCHAIN_PATH}/${TFM_TOOLCHAIN_PREFIX} - -DQCBOR_PATH${QCBOR_PATH_TYPE}=${CONFIG_TFM_QCBOR_PATH} - -DCMAKE_BUILD_TYPE=RelWithDebInfo - -DZEPHYR_NRF_MODULE_DIR=${ZEPHYR_NRF_MODULE_DIR} - -DTFM_BOARDS_NRF_DIR=${TFM_BOARDS_NRF_DIR} - -DNRF_CONFIG_CPU_FREQ_MHZ=${CONFIG_TFM_CPU_FREQ_MHZ} - BUILD_COMMAND ${CMAKE_COMMAND} --build . - INSTALL_COMMAND "" - BUILD_ALWAYS True - USES_TERMINAL_BUILD True - WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/tfm_ns - DEPENDS tfm - BUILD_BYPRODUCTS - ${TFM_NS_HEX_FILE} - ${TFM_NS_BIN_FILE} - ${TFM_NS_SIGNED_BIN_FILE} -) - -add_dependencies(app tfm_regression_test_app) diff --git a/tests/tfm/tfm_regression_test/README.rst b/tests/tfm/tfm_regression_test/README.rst deleted file mode 100644 index fa7c5e7b314f..000000000000 --- a/tests/tfm/tfm_regression_test/README.rst +++ /dev/null @@ -1,131 +0,0 @@ -.. _tfm_regression_test: - -TF-M: Regression tests -###################### - -.. contents:: - :local: - :depth: 2 - -Use this test sample to run secure and non-secure Trusted Firmware-M (TF-M) regression tests. - -Requirements -************ - -This test sample requires that the device is provisioned with the PSA root-of-trust security parameters using the :ref:`provisioning image ` sample. -Build and flash the provisioning image sample before using the test sample. - -The tests support the following development kits: - -.. table-from-rows:: /includes/sample_board_rows.txt - :header: heading - :rows: nrf5340dk_nrf5340_cpuapp_ns, nrf9151dk_nrf9151_ns, nrf9160dk_nrf9160_ns, nrf9161dk_nrf9161_ns - -Overview -******** - -Run both the secure and non-secure TF-M regression tests using the Zephyr build system. - -The build system will replace the Zephyr application with the non-secure TF-M test application, while the secure tests will be included in the TF-M build itself. - -The TF-M regression tests are implemented in the tf-m-tests repo: https://git.trustedfirmware.org/TF-M/tf-m-tests.git/. - -Configuration -************* - -Tests for both the secure and non-secure area are enabled by default, but can be controlled using the Kconfig options :kconfig:option:`CONFIG_TFM_REGRESSION_S` and :kconfig:option:`CONFIG_TFM_REGRESSION_NS` respectively. - -|config| - -Building and running -******************** - -.. |test path| replace:: :file:`tests/tfm/tfm_regression_test/` - -.. include:: /includes/build_and_run_test.txt - -.. note:: - For programming, use the :ref:`programming command without --erase `. - Programming with ``--erase`` or ``--recover`` (or similar parameters) will erase the PSA platform security parameters. - -Test files can be found under :file:`/modules/tee/tf-m/tf-m-tests/tests_reg` in the |NCS| folder structure. - -Output -====== - - .. code-block:: console - - Non-Secure system starting... - - #### Execute test suites for the Secure area #### - - [...] - - Running Test Suite PS reliability tests (TFM_PS_TEST_3XXX)... - > Executing 'TFM_PS_TEST_3001' - Description: 'repetitive sets and gets in/from an asset' - > Iteration 15 of 15 - TEST: TFM_PS_TEST_3001 - PASSED! - > Executing 'TFM_PS_TEST_3002' - Description: 'repetitive sets, gets and removes' - > Iteration 15 of 15 - TEST: TFM_PS_TEST_3002 - PASSED! - TESTSUITE PASSED! - - [...] - - *** Secure test suites summary *** - Test suite 'PSA protected storage S interface tests (TFM_PS_TEST_2XXX)' has PASSED - Test suite 'PS reliability tests (TFM_PS_TEST_3XXX)' has PASSED - Test suite 'PS rollback protection tests (TFM_PS_TEST_4XXX)' has PASSED - Test suite 'PSA internal trusted storage S interface tests (TFM_ITS_TEST_2XXX)' has PASSED - Test suite 'ITS reliability tests (TFM_ITS_TEST_3XXX)' has PASSED - Test suite 'Crypto secure interface tests (TFM_CRYPTO_TEST_5XXX)' has PASSED - Test suite 'Initial Attestation Service secure interface tests(TFM_ATTEST_TEST_1XXX)' has PASSED - Test suite 'Platform Service Secure interface tests(TFM_PLATFORM_TEST_1XXX)' has PASSED - Test suite 'IPC secure interface test (TFM_IPC_TEST_1XXX)' has PASSED - - *** End of Secure test suites *** - - #### Execute test suites for the Non-secure area #### - - [...] - - Running Test Suite Core non-secure positive tests (TFM_CORE_TEST_1XXX)... - > Executing 'TFM_CORE_TEST_1001' - Description: 'Test service request from NS thread mode' - TEST: TFM_CORE_TEST_1001 - PASSED! - > Executing 'TFM_CORE_TEST_1003' - Description: 'Test the success of service init' - TEST: TFM_CORE_TEST_1003 - PASSED! - > Executing 'TFM_CORE_TEST_1007' - Description: 'Test secure service buffer accesses' - TEST: TFM_CORE_TEST_1007 - PASSED! - > Executing 'TFM_CORE_TEST_1008' - Description: 'Test secure service to service call' - TEST: TFM_CORE_TEST_1008 - PASSED! - > Executing 'TFM_CORE_TEST_1010' - Description: 'Test secure service to service call with buffer handling' - TEST: TFM_CORE_TEST_1010 - PASSED! - > Executing 'TFM_CORE_TEST_1015' - Description: 'Test service parameter sanitization' - TEST: TFM_CORE_TEST_1015 - PASSED! - > Executing 'TFM_CORE_TEST_1016' - Description: 'Test outvec write' - TEST: TFM_CORE_TEST_1016 - PASSED! - TESTSUITE PASSED! - - [...] - - *** Non-secure test suites summary *** - Test suite 'PSA protected storage NS interface tests (TFM_PS_TEST_1XXX)' has PASSED - Test suite 'PSA internal trusted storage NS interface tests (TFM_ITS_TEST_1XXX)' has PASSED - Test suite 'Crypto non-secure interface test (TFM_CRYPTO_TEST_6XXX)' has PASSED - Test suite 'Platform Service Non-Secure interface tests(TFM_PLATFORM_TEST_2XXX)' has PASSED - Test suite 'Initial Attestation Service non-secure interface tests(TFM_ATTEST_TEST_2XXX)' has PASSED - Test suite 'QCBOR regression test(TFM_QCBOR_TEST_7XXX)' has PASSED - Test suite 'T_COSE regression test(TFM_T_COSE_TEST_8XXX)' has PASSED - Test suite 'Core non-secure positive tests (TFM_CORE_TEST_1XXX)' has PASSED - Test suite 'IPC non-secure interface test (TFM_IPC_TEST_1XXX)' has PASSED - - *** End of Non-secure test suites *** diff --git a/tests/tfm/tfm_regression_test/prj.conf b/tests/tfm/tfm_regression_test/prj.conf deleted file mode 100644 index b8eec1c30059..000000000000 --- a/tests/tfm/tfm_regression_test/prj.conf +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_TFM_USE_NS_APP=y -CONFIG_TFM_REGRESSION_S=y -CONFIG_TFM_REGRESSION_NS=y - -# Regression tests are included if a related secure partition is enabled. -CONFIG_TFM_PARTITION_PROTECTED_STORAGE=y -CONFIG_TFM_PARTITION_INTERNAL_TRUSTED_STORAGE=y -CONFIG_TFM_PARTITION_CRYPTO=y -CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=y -CONFIG_TFM_PARTITION_PLATFORM=y - -# Initial Attestation service requires provisioning -CONFIG_TFM_NRF_PROVISIONING=y -CONFIG_NRF_APPROTECT_LOCK=y -CONFIG_NRF_SECURE_APPROTECT_LOCK=y -CONFIG_IDENTITY_KEY_TFM=y - -# Enable IPC mode and isolation level 2 by default -CONFIG_TFM_IPC=y -CONFIG_TFM_ISOLATION_LEVEL=2 - -# RNG -CONFIG_PSA_WANT_GENERATE_RANDOM=y - -# Keys -CONFIG_PSA_WANT_KEY_TYPE_AES=y -CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT=y -CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT=y -CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE=y -CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE=y -CONFIG_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT=y -CONFIG_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT=y -CONFIG_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE=y -CONFIG_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE=y - -# Ciphers -CONFIG_PSA_WANT_ALG_ECB_NO_PADDING=y -CONFIG_PSA_WANT_ALG_CBC_NO_PADDING=y -CONFIG_PSA_WANT_ALG_CBC_PKCS7=y -CONFIG_PSA_WANT_ALG_CTR=y - -# Key derivation functions -CONFIG_PSA_WANT_ALG_HKDF=y -CONFIG_PSA_WANT_ALG_TLS12_PRF=y -CONFIG_PSA_WANT_ALG_TLS12_PSK_TO_MS=y - -# MAC -CONFIG_PSA_WANT_ALG_HMAC=y - -# AEAD -CONFIG_PSA_WANT_ALG_CCM=y -CONFIG_PSA_WANT_ALG_GCM=y - -# ECC -CONFIG_PSA_WANT_ALG_ECDH=y -CONFIG_PSA_WANT_ALG_ECDSA=y -CONFIG_PSA_WANT_ALG_DETERMINISTIC_ECDSA=y - -# ECC curves -CONFIG_PSA_WANT_ECC_SECP_R1_256=y - -# RSA -CONFIG_PSA_WANT_ALG_RSA_OAEP=y -CONFIG_PSA_WANT_ALG_RSA_PKCS1V15_CRYPT=y -CONFIG_PSA_WANT_ALG_RSA_PKCS1V15_SIGN=y -CONFIG_PSA_WANT_ALG_RSA_PSS=y - -CONFIG_PSA_WANT_RSA_KEY_SIZE_1024=y -CONFIG_PSA_WANT_RSA_KEY_SIZE_2048=y -CONFIG_PSA_WANT_RSA_KEY_SIZE_3072=y - -# HASH -CONFIG_PSA_WANT_ALG_SHA_1=n # This is used to test not supported return code -CONFIG_PSA_WANT_ALG_SHA_224=y -CONFIG_PSA_WANT_ALG_SHA_256=y -CONFIG_PSA_WANT_ALG_SHA_384=y -CONFIG_PSA_WANT_ALG_SHA_512=y - -CONFIG_TFM_SECURE_UART_SHARE_INSTANCE=n diff --git a/tests/tfm/tfm_regression_test/src/main.c b/tests/tfm/tfm_regression_test/src/main.c deleted file mode 100644 index 41c58c537722..000000000000 --- a/tests/tfm/tfm_regression_test/src/main.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA. - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include - -int main(void) -{ - printk("Should not be printed, expected TF-M's NS application to be run instead.\n"); - k_panic(); - - return 0; /* unreachable */ -} diff --git a/tests/zephyr/drivers/flash/negative_tests_nrf7120/src/main.c b/tests/zephyr/drivers/flash/negative_tests_nrf7120/src/main.c index 80ccfa691898..37bb2b4614e1 100644 --- a/tests/zephyr/drivers/flash/negative_tests_nrf7120/src/main.c +++ b/tests/zephyr/drivers/flash/negative_tests_nrf7120/src/main.c @@ -22,15 +22,15 @@ * fixed-partition nodes. */ #if defined(TEST_AREA) -#define TEST_AREA_OFFSET FIXED_PARTITION_OFFSET(TEST_AREA) -#define TEST_AREA_SIZE FIXED_PARTITION_SIZE(TEST_AREA) +#define TEST_AREA_OFFSET PARTITION_OFFSET(TEST_AREA) +#define TEST_AREA_SIZE PARTITION_SIZE(TEST_AREA) #if defined(CONFIG_SOC_SERIES_NRF54L) -#define TEST_AREA_DEVICE FIXED_PARTITION_DEVICE(TEST_AREA) +#define TEST_AREA_DEVICE PARTITION_DEVICE(TEST_AREA) #define TEST_FLASH_START (DT_REG_ADDR(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA)))) #define TEST_FLASH_SIZE (DT_REG_SIZE(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA)))) #elif defined(CONFIG_SOC_NRF54H20) -#define TEST_AREA_DEVICE FIXED_PARTITION_DEVICE(TEST_AREA) +#define TEST_AREA_DEVICE PARTITION_DEVICE(TEST_AREA) #define TEST_FLASH_START (DT_REG_ADDR(DT_PARENT(DT_PARENT(DT_NODELABEL(TEST_AREA))))) #define TEST_FLASH_SIZE (DT_REG_SIZE(DT_PARENT(DT_PARENT(DT_NODELABEL(TEST_AREA))))) #elif defined(CONFIG_SOC_NRF7120) diff --git a/tests/zephyr/drivers/mspi/controller_peripheral/src/main.c b/tests/zephyr/drivers/mspi/controller_peripheral/src/main.c index 6644b9ccad84..3207ec83952f 100644 --- a/tests/zephyr/drivers/mspi/controller_peripheral/src/main.c +++ b/tests/zephyr/drivers/mspi/controller_peripheral/src/main.c @@ -287,8 +287,6 @@ static int peripheral_rx_len(struct spi_buf_set *tx_set, struct spi_buf_set *rx_ static void run_test(bool m_same_size, bool s_same_size, bool emu_spis_dev) { int rv; - int periph_rv; - int srx_len; tdata.test_emu_spis_dev = emu_spis_dev; @@ -297,10 +295,17 @@ static void run_test(bool m_same_size, bool s_same_size, bool emu_spis_dev) if (emu_spis_dev) { if (tdata.srx_set) { + int periph_rv; + int srx_len; + periph_rv = spi_transceive(spis_dev, &spis_config, NULL, tdata.srx_set); if (periph_rv == -ENOTSUP) { ztest_test_skip(); } + + srx_len = peripheral_rx_len(tdata.mtx_set, tdata.srx_set); + zassert_equal(periph_rv, srx_len, "Got: %d but expected:%d", + periph_rv, srx_len); } if (tdata.stx_set) { @@ -327,11 +332,6 @@ static void run_test(bool m_same_size, bool s_same_size, bool emu_spis_dev) /* This releases the MSPI controller. */ (void)mspi_get_channel_status(mspi_bus, 0); - if (emu_spis_dev && tdata.srx_set) { - srx_len = peripheral_rx_len(tdata.mtx_set, tdata.srx_set); - zassert_equal(periph_rv, srx_len, "Got: %d but expected:%d", periph_rv, srx_len); - } - rv = check_buffers(tdata.mtx_set, tdata.srx_set, m_same_size); zassert_equal(rv, 0); diff --git a/tests/zephyr/drivers/uart/uart_mix_fifo_poll/prj.conf b/tests/zephyr/drivers/uart/uart_mix_fifo_poll/prj.conf index fa22b3a47b89..13234ab13d9a 100644 --- a/tests/zephyr/drivers/uart/uart_mix_fifo_poll/prj.conf +++ b/tests/zephyr/drivers/uart/uart_mix_fifo_poll/prj.conf @@ -5,6 +5,7 @@ CONFIG_ZTEST_THREAD_PRIORITY=5 CONFIG_MAIN_STACK_SIZE=2048 CONFIG_ZTEST_STACK_SIZE=2048 CONFIG_TEST_RANDOM_GENERATOR=y +CONFIG_TIMER_RANDOM_GENERATOR=y CONFIG_COUNTER=y # CONFIG_NO_OPTIMIZATIONS=y diff --git a/tests/zephyr/drivers/watchdog/wdt_basic_api/Kconfig b/tests/zephyr/drivers/watchdog/wdt_basic_api/Kconfig new file mode 100644 index 000000000000..f758936c8981 --- /dev/null +++ b/tests/zephyr/drivers/watchdog/wdt_basic_api/Kconfig @@ -0,0 +1 @@ +source "tests/drivers/watchdog/wdt_basic_api/Kconfig" diff --git a/tests/zephyr/modules/tf-m/regression/CMakeLists.txt b/tests/zephyr/modules/tf-m/regression/CMakeLists.txt new file mode 100644 index 000000000000..2ffb7e4c5492 --- /dev/null +++ b/tests/zephyr/modules/tf-m/regression/CMakeLists.txt @@ -0,0 +1,21 @@ +# +# Copyright (c) 2026 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +cmake_minimum_required(VERSION 3.20.0) + +find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) + +project(tfm_regression_test) + +include(${ZEPHYR_BASE}/tests/modules/tf-m/regression/CMakeLists.txt) + +# CONFIG_TFM_ITS_ENCRYPTED (ITS_ENCRYPTION) enables PSA_WANT_ALG_CHACHA20_POLY1305 +# which results in the ChaCha20* tests being enabled, but some of them (RFC7539 verification) +# fail, so keep them disabled for now as they used to be. +target_compile_options(app PRIVATE + -UTFM_CRYPTO_TEST_CHACHA20 + -UTFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305 +) diff --git a/tests/zephyr/modules/tf-m/regression/Kconfig b/tests/zephyr/modules/tf-m/regression/Kconfig new file mode 100644 index 000000000000..7f64a1b65eb1 --- /dev/null +++ b/tests/zephyr/modules/tf-m/regression/Kconfig @@ -0,0 +1 @@ +source "${ZEPHYR_BASE}/tests/modules/tf-m/regression/Kconfig" diff --git a/tests/zephyr/modules/tf-m/regression/boards/nrf5340dk_nrf5340_cpuapp_ns.conf b/tests/zephyr/modules/tf-m/regression/boards/nrf5340dk_nrf5340_cpuapp_ns.conf new file mode 100644 index 000000000000..da721d1cf8c7 --- /dev/null +++ b/tests/zephyr/modules/tf-m/regression/boards/nrf5340dk_nrf5340_cpuapp_ns.conf @@ -0,0 +1,16 @@ +# Copyright (c) 2026 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +# TF-M needs more flash to fit when CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y +CONFIG_PM_PARTITION_SIZE_TFM=0x48000 + +# NCSDK-38968: Attestation tests don't work + +#CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=y + +# Initial Attestation service requires provisioning +#CONFIG_TFM_NRF_PROVISIONING=y +#CONFIG_NRF_APPROTECT_LOCK=y +#CONFIG_NRF_SECURE_APPROTECT_LOCK=y +#CONFIG_IDENTITY_KEY_TFM=y diff --git a/tests/tfm/tfm_regression_test/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay b/tests/zephyr/modules/tf-m/regression/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay similarity index 100% rename from tests/tfm/tfm_regression_test/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay rename to tests/zephyr/modules/tf-m/regression/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay diff --git a/tests/tfm/tfm_regression_test/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/tests/zephyr/modules/tf-m/regression/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf similarity index 71% rename from tests/tfm/tfm_regression_test/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf rename to tests/zephyr/modules/tf-m/regression/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 8fd2a0f3064d..bf4001ce353b 100644 --- a/tests/tfm/tfm_regression_test/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/tests/zephyr/modules/tf-m/regression/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -1,13 +1,10 @@ -# # Copyright (c) 2024 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# # The tests need more RAM CONFIG_PM_PARTITION_SIZE_TFM_SRAM=0x17000 -# NCSDK-22598: Attestation support for nRF54L15 is not implemented yet -# So disable it for now +# NCSDK-27603 / NCSDK-38968 CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=n CONFIG_TFM_NRF_PROVISIONING=n diff --git a/tests/tfm/tfm_regression_test/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay b/tests/zephyr/modules/tf-m/regression/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay similarity index 100% rename from tests/tfm/tfm_regression_test/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay rename to tests/zephyr/modules/tf-m/regression/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay diff --git a/tests/tfm/tfm_regression_test/boards/nrf7120dk_nrf7120_cpuapp_ns.conf b/tests/zephyr/modules/tf-m/regression/boards/nrf7120dk_nrf7120_cpuapp_ns.conf similarity index 91% rename from tests/tfm/tfm_regression_test/boards/nrf7120dk_nrf7120_cpuapp_ns.conf rename to tests/zephyr/modules/tf-m/regression/boards/nrf7120dk_nrf7120_cpuapp_ns.conf index df17779f54e7..d4b4bffe6a2f 100644 --- a/tests/tfm/tfm_regression_test/boards/nrf7120dk_nrf7120_cpuapp_ns.conf +++ b/tests/zephyr/modules/tf-m/regression/boards/nrf7120dk_nrf7120_cpuapp_ns.conf @@ -1,13 +1,10 @@ -# # Copyright (c) 2025 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# # The tests need more RAM CONFIG_PM_PARTITION_SIZE_TFM_SRAM=0x17000 # WZN-7352: Attestation support for nRF7120 is not implemented yet -# So disable it for now CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=n CONFIG_TFM_NRF_PROVISIONING=n diff --git a/tests/tfm/tfm_regression_test/boards/nrf7120dk_nrf7120_cpuapp_ns.overlay b/tests/zephyr/modules/tf-m/regression/boards/nrf7120dk_nrf7120_cpuapp_ns.overlay similarity index 100% rename from tests/tfm/tfm_regression_test/boards/nrf7120dk_nrf7120_cpuapp_ns.overlay rename to tests/zephyr/modules/tf-m/regression/boards/nrf7120dk_nrf7120_cpuapp_ns.overlay diff --git a/tests/zephyr/modules/tf-m/regression/boards/nrf9151dk_nrf9151_ns.conf b/tests/zephyr/modules/tf-m/regression/boards/nrf9151dk_nrf9151_ns.conf new file mode 100644 index 000000000000..da721d1cf8c7 --- /dev/null +++ b/tests/zephyr/modules/tf-m/regression/boards/nrf9151dk_nrf9151_ns.conf @@ -0,0 +1,16 @@ +# Copyright (c) 2026 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +# TF-M needs more flash to fit when CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y +CONFIG_PM_PARTITION_SIZE_TFM=0x48000 + +# NCSDK-38968: Attestation tests don't work + +#CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=y + +# Initial Attestation service requires provisioning +#CONFIG_TFM_NRF_PROVISIONING=y +#CONFIG_NRF_APPROTECT_LOCK=y +#CONFIG_NRF_SECURE_APPROTECT_LOCK=y +#CONFIG_IDENTITY_KEY_TFM=y diff --git a/tests/tfm/tfm_regression_test/boards/nrf9151dk_nrf9151_ns.overlay b/tests/zephyr/modules/tf-m/regression/boards/nrf9151dk_nrf9151_ns.overlay similarity index 100% rename from tests/tfm/tfm_regression_test/boards/nrf9151dk_nrf9151_ns.overlay rename to tests/zephyr/modules/tf-m/regression/boards/nrf9151dk_nrf9151_ns.overlay diff --git a/tests/zephyr/modules/tf-m/regression/boards/nrf9160dk_nrf9160_ns.conf b/tests/zephyr/modules/tf-m/regression/boards/nrf9160dk_nrf9160_ns.conf new file mode 100644 index 000000000000..da721d1cf8c7 --- /dev/null +++ b/tests/zephyr/modules/tf-m/regression/boards/nrf9160dk_nrf9160_ns.conf @@ -0,0 +1,16 @@ +# Copyright (c) 2026 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +# TF-M needs more flash to fit when CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y +CONFIG_PM_PARTITION_SIZE_TFM=0x48000 + +# NCSDK-38968: Attestation tests don't work + +#CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=y + +# Initial Attestation service requires provisioning +#CONFIG_TFM_NRF_PROVISIONING=y +#CONFIG_NRF_APPROTECT_LOCK=y +#CONFIG_NRF_SECURE_APPROTECT_LOCK=y +#CONFIG_IDENTITY_KEY_TFM=y diff --git a/tests/tfm/tfm_regression_test/boards/nrf9161dk_nrf9161_ns.overlay b/tests/zephyr/modules/tf-m/regression/boards/nrf9160dk_nrf9160_ns.overlay similarity index 100% rename from tests/tfm/tfm_regression_test/boards/nrf9161dk_nrf9161_ns.overlay rename to tests/zephyr/modules/tf-m/regression/boards/nrf9160dk_nrf9160_ns.overlay diff --git a/tests/zephyr/modules/tf-m/regression/boards/nrf9161dk_nrf9161_ns.conf b/tests/zephyr/modules/tf-m/regression/boards/nrf9161dk_nrf9161_ns.conf new file mode 100644 index 000000000000..da721d1cf8c7 --- /dev/null +++ b/tests/zephyr/modules/tf-m/regression/boards/nrf9161dk_nrf9161_ns.conf @@ -0,0 +1,16 @@ +# Copyright (c) 2026 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +# TF-M needs more flash to fit when CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y +CONFIG_PM_PARTITION_SIZE_TFM=0x48000 + +# NCSDK-38968: Attestation tests don't work + +#CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=y + +# Initial Attestation service requires provisioning +#CONFIG_TFM_NRF_PROVISIONING=y +#CONFIG_NRF_APPROTECT_LOCK=y +#CONFIG_NRF_SECURE_APPROTECT_LOCK=y +#CONFIG_IDENTITY_KEY_TFM=y diff --git a/tests/tfm/tfm_regression_test/boards/nrf9160dk_nrf9160_ns.overlay b/tests/zephyr/modules/tf-m/regression/boards/nrf9161dk_nrf9161_ns.overlay similarity index 91% rename from tests/tfm/tfm_regression_test/boards/nrf9160dk_nrf9160_ns.overlay rename to tests/zephyr/modules/tf-m/regression/boards/nrf9161dk_nrf9161_ns.overlay index 623fcaf49450..774389839921 100644 --- a/tests/tfm/tfm_regression_test/boards/nrf9160dk_nrf9160_ns.overlay +++ b/tests/zephyr/modules/tf-m/regression/boards/nrf9161dk_nrf9161_ns.overlay @@ -7,6 +7,7 @@ compatible = "nordic,nrf-uarte"; current-speed = <115200>; status = "okay"; + hw-flow-control; }; &uart1 { @@ -14,4 +15,5 @@ current-speed = <115200>; /* Set to disabled in application, since TF-M will be using it. */ status = "disabled"; + hw-flow-control; }; diff --git a/tests/zephyr/modules/tf-m/regression/prj.conf b/tests/zephyr/modules/tf-m/regression/prj.conf new file mode 100644 index 000000000000..cd37704681fe --- /dev/null +++ b/tests/zephyr/modules/tf-m/regression/prj.conf @@ -0,0 +1,19 @@ +# +# Copyright (c) 2021 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_TFM_SECURE_UART_SHARE_INSTANCE=n + +# Enable IPC mode and isolation level 2 by default +CONFIG_TFM_IPC=y +CONFIG_TFM_ISOLATION_LEVEL=2 + +# PSA_WANTs not supported (and so not enabled) by Zephyr + +CONFIG_PSA_WANT_GENERATE_RANDOM=y + +CONFIG_PSA_WANT_RSA_KEY_SIZE_1024=y +CONFIG_PSA_WANT_RSA_KEY_SIZE_2048=y +CONFIG_PSA_WANT_RSA_KEY_SIZE_3072=y diff --git a/tests/tfm/tfm_regression_test/testcase.yaml b/tests/zephyr/modules/tf-m/regression/testcase.yaml similarity index 74% rename from tests/tfm/tfm_regression_test/testcase.yaml rename to tests/zephyr/modules/tf-m/regression/testcase.yaml index c07e1eb5d0d9..ce144ece180d 100644 --- a/tests/tfm/tfm_regression_test/testcase.yaml +++ b/tests/zephyr/modules/tf-m/regression/testcase.yaml @@ -2,22 +2,28 @@ common: tags: - tfm - ci_tests_tfm - build_only: true + - sysbuild + modules: + - tf-m-tests harness: console harness_config: type: multi_line + ordered: true regex: - - "Non-Secure system starting..." - - "\\#\\#\\#\\# Execute test suites for the Non-secure area \\#\\#\\#\\#" - - "\\*\\*\\* End of Non-secure test suites \\*\\*\\*" + # There's an ANSI escape code between has and PASSED: \x1b[32m (green color). The log file + # strips ANSI sequences, which is why it looks clean there. But harness.handle() receives + # the raw line with ANSI codes — so has PASSED never matches as a literal string. + - "Test suite 'PSA protected storage NS interface tests.*' has.*PASSED" + - "Test suite 'PSA internal trusted storage NS interface tests.*' has.*PASSED" + - "Test suite 'Crypto non-secure interface test.*' has.*PASSED" + - "Test suite 'Platform Service Non-Secure interface tests.*' has.*PASSED" + extra_args: + - EXTRA_CONF_FILE=${ZEPHYR_BASE}/tests/modules/tf-m/regression/prj.conf tests: - tfm.regression_ipc_lvl1: - sysbuild: true + nrf.extended.tf-m.regression.ipc.lvl1: tags: - tfm_lvl1 - - sysbuild - - ci_tests_tfm extra_args: - CONFIG_TFM_IPC=y - CONFIG_TFM_ISOLATION_LEVEL=1 @@ -34,13 +40,9 @@ tests: - nrf54l15dk/nrf54l15/cpuapp/ns - nrf7120dk/nrf7120/cpuapp/ns - nrf9151dk/nrf9151/ns - - nrf9161dk/nrf9161/ns - tfm.regression_ipc_lvl2.cc3xx: - sysbuild: true + nrf.extended.tf-m.regression.ipc.lvl2.cc3xx: tags: - tfm_lvl2 - - sysbuild - - ci_tests_tfm extra_args: - CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y - CONFIG_PSA_CRYPTO_DRIVER_OBERON=n @@ -53,13 +55,9 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns - nrf9151dk/nrf9151/ns - - nrf9161dk/nrf9161/ns - tfm.regression_ipc_lvl2.oberon: - sysbuild: true + nrf.extended.tf-m.regression.ipc.lvl2.oberon: tags: - tfm_lvl2 - - sysbuild - - ci_tests_tfm extra_args: - CONFIG_PSA_CRYPTO_DRIVER_CC3XX=n - CONFIG_PSA_CRYPTO_DRIVER_OBERON=y @@ -72,13 +70,9 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns - nrf9151dk/nrf9151/ns - - nrf9161dk/nrf9161/ns - tfm.regression_ipc_lvl2.cc3xx_oberon: - sysbuild: true + nrf.extended.tf-m.regression.ipc.lvl2.cc3xx.oberon: tags: - tfm_lvl2 - - sysbuild - - ci_tests_tfm extra_args: - CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y - CONFIG_PSA_CRYPTO_DRIVER_OBERON=y @@ -91,14 +85,9 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns - nrf9151dk/nrf9151/ns - - nrf9160dk/nrf9160/ns - - nrf9161dk/nrf9161/ns - tfm.regression_ipc_lvl2.cracen: - sysbuild: true + nrf.extended.tf-m.regression.ipc.lvl2.cracen: tags: - tfm_lvl2 - - sysbuild - - ci_tests_tfm extra_args: - CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y - CONFIG_PSA_CRYPTO_DRIVER_OBERON=n @@ -109,12 +98,9 @@ tests: integration_platforms: - nrf54l15dk/nrf54l15/cpuapp/ns - nrf7120dk/nrf7120/cpuapp/ns - tfm.regression_sfn_lvl1: - sysbuild: true + nrf.extended.tf-m.regression.sfn: tags: - tfm_lvl1 - - sysbuild - - ci_tests_tfm extra_args: - CONFIG_TFM_SFN=y - CONFIG_TFM_ISOLATION_LEVEL=1 @@ -131,13 +117,9 @@ tests: - nrf54l15dk/nrf54l15/cpuapp/ns - nrf7120dk/nrf7120/cpuapp/ns - nrf9151dk/nrf9151/ns - - nrf9161dk/nrf9161/ns - tfm.regression_fp_hardabi: - sysbuild: true + nrf.extended.tf-m.regression.fp.hardabi: tags: - tfm_fp - - sysbuild - - ci_tests_tfm extra_args: - CONFIG_FPU=y - CONFIG_FP_HARDABI=y @@ -153,4 +135,3 @@ tests: - nrf54l15dk/nrf54l15/cpuapp/ns - nrf7120dk/nrf7120/cpuapp/ns - nrf9151dk/nrf9151/ns - - nrf9161dk/nrf9161/ns diff --git a/tests/zephyr/subsys/secure_storage/psa/its/boards/nrf52840dk_nrf52840.overlay b/tests/zephyr/subsys/secure_storage/psa/its/boards/nrf52840dk_nrf52840.overlay index 68d16cc214a5..be8b236c8b52 100644 --- a/tests/zephyr/subsys/secure_storage/psa/its/boards/nrf52840dk_nrf52840.overlay +++ b/tests/zephyr/subsys/secure_storage/psa/its/boards/nrf52840dk_nrf52840.overlay @@ -3,11 +3,13 @@ &flash0 { partitions { hw_unique_key_partition: partition@fd000 { + compatible = "zephyr,mapped-partition"; label = "hw-unique-key"; reg = <0x000fd000 0x00001000>; }; storage_partition: partition@fe000 { + compatible = "zephyr,mapped-partition"; label = "storage"; reg = <0x000fe000 0x00002000>; }; diff --git a/west.yml b/west.yml index 1b4b0b4a3c23..406c8b6fd907 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 22041af254382bbdae065730f5b894aca2441787 + revision: e88cd523ff4b9d7484dc875048a0f2f14dbf99f2 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -85,13 +85,13 @@ manifest: - cmsis-dsp - cmsis-nn - cmsis_6 + - dhara - edtt - fatfs - hal_nordic - hal_st # required for ST sensors (unrelated to STM32 MCUs) - hal_tdk # required for Invensense sensors such as ICM42670 - hal_wurthelektronik - - hostap - liblc3 - libmetal - libsbc @@ -128,7 +128,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: 3564357ded56efe100f9c2bb0b1a0a06d01a1c44 + revision: 8230615892bd06e59d3e6af7e423c6f74a4645ef path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR @@ -145,7 +145,7 @@ manifest: - name: nrfxlib repo-path: sdk-nrfxlib path: nrfxlib - revision: acb0f7e67065406fe1106e33f880f24aa5098184 + revision: 45b524bc75a934a5f71dca061282839064ccb653 - name: trusted-firmware-m repo-path: sdk-trusted-firmware-m path: modules/tee/tf-m/trusted-firmware-m @@ -157,7 +157,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: 68fb1e39ed5114a755fe661cd63c15b5a49b995c + revision: d7be4e64ada1802ce1b5948a05e3cd160639dda1 west-commands: scripts/west/west-commands.yml submodules: - name: nlio @@ -246,7 +246,7 @@ manifest: remote: throwtheswitch - name: memfault-firmware-sdk path: modules/lib/memfault-firmware-sdk - revision: 1.37.1 + revision: 1.38.0 remote: memfault - name: bsim repo-path: bsim_west @@ -274,6 +274,10 @@ manifest: revision: d5fad6bd094899101a4e5fd53af7298160ced6ab groups: - benchmark + - name: hostap + repo-path: sdk-hostap + path: modules/lib/hostap + revision: 8fd18deb93f639919650fd7a35546a958c3f25c6 # West-related configuration for the nrf repository. self: