manifest: Update sdk-zephyr revision

cmake/mesh_dfu_metadata.cmake

@@ -8,12 +8,12 @@ find_package(Python3 REQUIRED)
 
 function(mesh_dfu_metadata)
   if(SYSBUILD)
-    set(metadata_dir ${PROJECT_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr)
+    set(metadata_dir ${CMAKE_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr)
   else()
     set(metadata_dir ${PROJECT_BINARY_DIR})
   endif()
 
-  set(metadata_depends ${PROJECT_BINARY_DIR}/dfu_application.zip)
+  set(metadata_depends ${CMAKE_BINARY_DIR}/dfu_application.zip)
 
   add_custom_command(
     OUTPUT ${PROJECT_BINARY_DIR}/dfu_application.zip_ble_mesh_metadata.json

cmake/sysbuild/b0_mcuboot_signing.cmake

@@ -52,7 +52,7 @@ function(ncs_secure_boot_mcuboot_sign application bin_files signed_targets prefi
   endif()
 
   # Extensionless prefix of any output file.
-  set(output ${PROJECT_BINARY_DIR}/signed_by_mcuboot_and_b0_${application})
+  set(output ${CMAKE_BINARY_DIR}/signed_by_mcuboot_and_b0_${application})
 
   # List of additional build byproducts.
   set(byproducts)
@@ -75,13 +75,13 @@ function(ncs_secure_boot_mcuboot_sign application bin_files signed_targets prefi
       # Hence, if a programmer is given this hex file, it will flash it
       # to the secondary slot, and upon reboot mcuboot will swap in the
       # contents of the hex file.
-      ${imgtool_sign} ${imgtool_extra} ${PROJECT_BINARY_DIR}/signed_by_b0_${application}.bin ${output}.bin
+      ${imgtool_sign} ${imgtool_extra} ${CMAKE_BINARY_DIR}/signed_by_b0_${application}.bin ${output}.bin
 
       DEPENDS
       ${application}_extra_byproducts
       ${application}_signed_kernel_hex_target
       ${application_image_dir}/zephyr/.config
-      ${PROJECT_BINARY_DIR}/signed_by_b0_${application}.bin
+      ${CMAKE_BINARY_DIR}/signed_by_b0_${application}.bin
       )
   endif()
 
@@ -98,13 +98,13 @@ function(ncs_secure_boot_mcuboot_sign application bin_files signed_targets prefi
       # Hence, if a programmer is given this hex file, it will flash it
       # to the secondary slot, and upon reboot mcuboot will swap in the
       # contents of the hex file.
-      ${imgtool_sign} ${imgtool_extra} ${PROJECT_BINARY_DIR}/signed_by_b0_${application}.hex ${output}.hex
+      ${imgtool_sign} ${imgtool_extra} ${CMAKE_BINARY_DIR}/signed_by_b0_${application}.hex ${output}.hex
 
       DEPENDS
       ${application}_extra_byproducts
       ${application}_signed_kernel_hex_target
       ${application_image_dir}/zephyr/.config
-      ${PROJECT_BINARY_DIR}/signed_by_b0_${application}.hex
+      ${CMAKE_BINARY_DIR}/signed_by_b0_${application}.hex
       )
   endif()
 
@@ -146,7 +146,7 @@ if(SB_CONFIG_BOOTLOADER_MCUBOOT)
       include(${ZEPHYR_NRF_MODULE_DIR}/cmake/fw_zip.cmake)
 
       generate_dfu_zip(
-        OUTPUT ${PROJECT_BINARY_DIR}/dfu_mcuboot.zip
+        OUTPUT ${CMAKE_BINARY_DIR}/dfu_mcuboot.zip
         BIN_FILES ${bin_files}
         TYPE mcuboot
         IMAGE mcuboot

cmake/sysbuild/b0_packaging.cmake

@@ -10,8 +10,8 @@ set(s0_name "signed_by_b0_${DEFAULT_IMAGE}.bin")
 set(s1_name signed_by_b0_s1_image.bin)
 
 generate_dfu_zip(
-  OUTPUT ${PROJECT_BINARY_DIR}/dfu_application.zip
-  BIN_FILES ${PROJECT_BINARY_DIR}/signed_by_b0_${DEFAULT_IMAGE}.bin ${PROJECT_BINARY_DIR}/signed_by_b0_s1_image.bin
+  OUTPUT ${CMAKE_BINARY_DIR}/dfu_application.zip
+  BIN_FILES ${CMAKE_BINARY_DIR}/signed_by_b0_${DEFAULT_IMAGE}.bin ${CMAKE_BINARY_DIR}/signed_by_b0_s1_image.bin
   ZIP_NAMES ${s0_name} ${s1_name}
   TYPE application
   IMAGE ${DEFAULT_IMAGE}

cmake/sysbuild/debug_keys.cmake

@@ -43,7 +43,7 @@ if(NOT SB_CONFIG_SECURE_BOOT_SIGNING_CUSTOM AND "${SB_CONFIG_SECURE_BOOT_SIGNING
     \n"
   )
 
-  set(DEBUG_SIGN_KEY ${PROJECT_BINARY_DIR}/GENERATED_NON_SECURE_SIGN_KEY_PRIVATE.pem)
+  set(DEBUG_SIGN_KEY ${CMAKE_BINARY_DIR}/GENERATED_NON_SECURE_SIGN_KEY_PRIVATE.pem)
   set(SIGNATURE_PRIVATE_KEY_FILE ${DEBUG_SIGN_KEY})
   add_custom_command(
     OUTPUT
@@ -90,10 +90,10 @@ if("${SB_CONFIG_SECURE_BOOT_PUBLIC_KEY_FILES}" STREQUAL "debug")
     \n"
     )
 
-  set(debug_public_key_0 ${PROJECT_BINARY_DIR}/GENERATED_NON_SECURE_PUBLIC_0.pem)
-  set(debug_private_key_0 ${PROJECT_BINARY_DIR}/GENERATED_NON_SECURE_PRIVATE_0.pem)
-  set(debug_public_key_1 ${PROJECT_BINARY_DIR}/GENERATED_NON_SECURE_PUBLIC_1.pem)
-  set(debug_private_key_1 ${PROJECT_BINARY_DIR}/GENERATED_NON_SECURE_PRIVATE_1.pem)
+  set(debug_public_key_0 ${CMAKE_BINARY_DIR}/GENERATED_NON_SECURE_PUBLIC_0.pem)
+  set(debug_private_key_0 ${CMAKE_BINARY_DIR}/GENERATED_NON_SECURE_PRIVATE_0.pem)
+  set(debug_public_key_1 ${CMAKE_BINARY_DIR}/GENERATED_NON_SECURE_PUBLIC_1.pem)
+  set(debug_private_key_1 ${CMAKE_BINARY_DIR}/GENERATED_NON_SECURE_PRIVATE_1.pem)
 
   list(APPEND PUBLIC_KEY_FILES ${debug_public_key_0} ${debug_public_key_1})
 

cmake/sysbuild/fast_pair_hex.cmake

@@ -17,7 +17,7 @@ add_custom_command(
   OUTPUT
   ${FP_PROVISIONING_DATA_HEX}
   DEPENDS
-  "${CMAKE_BINARY_DIR}/pm.config"
+  "${APPLICATION_BINARY_DIR}/pm.config"
   COMMAND
   ${PYTHON_EXECUTABLE} ${ZEPHYR_NRF_MODULE_DIR}/scripts/nrf_provision/fast_pair/fp_provision_cli.py
                        -o ${FP_PROVISIONING_DATA_HEX} -a ${FP_PROVISIONING_DATA_ADDRESS}

cmake/sysbuild/partition_manager.cmake

@@ -230,7 +230,7 @@ function(partition_manager)
       set(${part}_PM_TARGET ${part})
     else()
       if(${part} IN_LIST containers)
-        set_ifndef(${part}_PM_HEX_FILE ${PROJECT_BINARY_DIR}/${part}.hex)
+        set_ifndef(${part}_PM_HEX_FILE ${CMAKE_BINARY_DIR}/${part}.hex)
         set_ifndef(${part}_PM_TARGET ${part}_hex)
       endif()
       list(APPEND implicitly_assigned ${part})
@@ -275,11 +275,11 @@ function(partition_manager)
     # And under which circumstances.
     # Add command to merge files.
     add_custom_command(
-      OUTPUT ${PROJECT_BINARY_DIR}/${container}.hex
+      OUTPUT ${CMAKE_BINARY_DIR}/${container}.hex
       COMMAND
       ${PYTHON_EXECUTABLE}
       ${ZEPHYR_BASE}/scripts/build/mergehex.py
-      -o ${PROJECT_BINARY_DIR}/${container}.hex
+      -o ${CMAKE_BINARY_DIR}/${container}.hex
       ${${container}overlap_arg}
       ${${container}hex_files}
       DEPENDS
@@ -291,16 +291,16 @@ function(partition_manager)
     add_custom_target(
       ${container}_hex
       ALL DEPENDS
-      ${PROJECT_BINARY_DIR}/${container}.hex
+      ${CMAKE_BINARY_DIR}/${container}.hex
       )
 
     if (DEFINED PM_DOMAIN)
       get_property(image_name GLOBAL PROPERTY DOMAIN_APP_${PM_DOMAIN})
-      update_runner(IMAGE ${image_name} HEX ${PROJECT_BINARY_DIR}/${container}.hex)
+      update_runner(IMAGE ${image_name} HEX ${CMAKE_BINARY_DIR}/${container}.hex)
     endif()
 
     if ("${container}" STREQUAL "merged")
-      update_runner(IMAGE ${DEFAULT_IMAGE} HEX ${PROJECT_BINARY_DIR}/${container}.hex)
+      update_runner(IMAGE ${DEFAULT_IMAGE} HEX ${CMAKE_BINARY_DIR}/${container}.hex)
     endif()
   endforeach()
 
@@ -782,7 +782,7 @@ else()
 # End - Code related to network core update. Multi image updates are part of NCSDK-17807
 
   # Explicitly add the root image domain hex file to the list
-  list(APPEND domain_hex_files ${PROJECT_BINARY_DIR}/${merged}.hex)
+  list(APPEND domain_hex_files ${CMAKE_BINARY_DIR}/${merged}.hex)
   list(APPEND global_hex_depends ${merged}_hex)
 
   # Now all partition manager configuration from all images and domains are

cmake/sysbuild/provision_hex.cmake

@@ -16,7 +16,7 @@ function(provision application prefix_name)
 
   # Build and include hex file containing provisioned data for the bootloader.
   set(PROVISION_HEX_NAME     ${prefix_name}provision.hex)
-  set(PROVISION_HEX          ${PROJECT_BINARY_DIR}/${PROVISION_HEX_NAME})
+  set(PROVISION_HEX          ${CMAKE_BINARY_DIR}/${PROVISION_HEX_NAME})
 
   if(CONFIG_SECURE_BOOT)
     if(DEFINED CONFIG_SB_MONOTONIC_COUNTER)
@@ -47,7 +47,12 @@ function(provision application prefix_name)
         --public-key-files "${PUBLIC_KEY_FILES}"
       )
 
-      set(PROVISION_DEPENDS signature_public_key_file_target ${application}_extra_byproducts ${application}/zephyr/.config ${SIGNATURE_PUBLIC_KEY_FILE} zephyr/.config)
+      set(PROVISION_DEPENDS signature_public_key_file_target
+          ${application}_extra_byproducts
+          ${CMAKE_BINARY_DIR}/${application}/zephyr/.config
+          ${SIGNATURE_PUBLIC_KEY_FILE}
+          ${PROJECT_BINARY_DIR}/.config
+      )
     endif()
 
     # Adjustment to be able to load into sysbuild

cmake/sysbuild/sign.cmake

@@ -5,7 +5,7 @@
 #
 
 function(b0_gen_keys)
-  set(GENERATED_PATH ${PROJECT_BINARY_DIR}/nrf/subsys/bootloader/generated)
+  set(GENERATED_PATH ${CMAKE_BINARY_DIR}/nrf/subsys/bootloader/generated)
 
   # This is needed for make, ninja is able to resolve and create the path but make
   # is not able to resolve it.
@@ -49,7 +49,7 @@ function(b0_gen_keys)
         ${PUB_GEN_CMD}
         DEPENDS
         ${SIGNATURE_PRIVATE_KEY_FILE}
-        zephyr/.config
+        ${PROJECT_BINARY_DIR}/.config
         COMMENT
         "Creating public key from private key used for signing"
         WORKING_DIRECTORY
@@ -67,7 +67,7 @@ function(b0_gen_keys)
 endfunction()
 
 function(b0_sign_image slot)
-  set(GENERATED_PATH ${PROJECT_BINARY_DIR}/nrf/subsys/bootloader/generated)
+  set(GENERATED_PATH ${CMAKE_BINARY_DIR}/nrf/subsys/bootloader/generated)
 
   # Get variables for secure boot usage
   sysbuild_get(${slot}_sb_validation_info_version IMAGE ${slot} VAR CONFIG_SB_VALIDATION_INFO_VERSION KCONFIG)
@@ -87,8 +87,8 @@ function(b0_sign_image slot)
 
   set(VALIDATION_INFO_MAGIC    "${${slot}_fw_info_magic_common},${${slot}_sb_validation_info_magic},${MAGIC_COMPATIBILITY_VALIDATION_INFO}")
 
-  set(signed_hex ${PROJECT_BINARY_DIR}/signed_by_b0_${slot}.hex)
-  set(signed_bin ${PROJECT_BINARY_DIR}/signed_by_b0_${slot}.bin)
+  set(signed_hex ${CMAKE_BINARY_DIR}/signed_by_b0_${slot}.hex)
+  set(signed_bin ${CMAKE_BINARY_DIR}/signed_by_b0_${slot}.bin)
 
   if(NCS_SYSBUILD_PARTITION_MANAGER)
     # A container can be merged, in which case we should use old style below,

cmake/sysbuild/suit.cmake

@@ -123,7 +123,7 @@ function(suit_create_package)
   endif()
 
   list(APPEND CORE_ARGS
-    --core sysbuild,,,${CMAKE_BINARY_DIR}/zephyr/.config
+    --core sysbuild,,,${PROJECT_BINARY_DIR}/.config
   )
 
   foreach(image ${IMAGES})

cmake/sysbuild/zip.cmake

@@ -25,11 +25,11 @@ function(dfu_app_zip_package)
           "${app_update_name}slot_index_secondary=2"
           "${app_update_name}version_MCUBOOT=${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION}"
          )
-      list(APPEND bin_files "${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin")
+      list(APPEND bin_files "${CMAKE_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin")
       list(APPEND zip_names ${app_update_name})
       list(APPEND signed_targets ${DEFAULT_IMAGE}_extra_byproducts)
-      set(exclude_files EXCLUDE ${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin)
-      set(include_files INCLUDE ${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin)
+      set(exclude_files EXCLUDE ${CMAKE_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin)
+      set(include_files INCLUDE ${CMAKE_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin)
     else()
       # Application in DirectXIP mode
       set(generate_script_app_params
@@ -43,11 +43,20 @@ function(dfu_app_zip_package)
           "${secondary_app_update_name}version_MCUBOOT+XIP=${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION}"
          )
 
-      list(APPEND bin_files "${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin;mcuboot_secondary_app/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin")
+      list(APPEND bin_files
+           "${CMAKE_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin"
+           "${CMAKE_BINARY_DIR}/mcuboot_secondary_app/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin"
+      )
       list(APPEND zip_names "${app_update_name};${secondary_app_update_name}")
       list(APPEND signed_targets ${DEFAULT_IMAGE}_extra_byproducts mcuboot_secondary_app_extra_byproducts)
-      set(exclude_files EXCLUDE ${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin;mcuboot_secondary_app/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin)
-      set(include_files INCLUDE ${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin;mcuboot_secondary_app/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin)
+      set(exclude_files EXCLUDE
+          ${CMAKE_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin
+          ${CMAKE_BINARY_DIR}/mcuboot_secondary_app/zephyr/${CONFIG_KERNEL_BIN_NAME}.signed.bin
+      )
+      set(include_files INCLUDE
+          ${CMAKE_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin
+          ${CMAKE_BINARY_DIR}/mcuboot_secondary_app/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin
+      )
     endif()
   endif()
 
@@ -67,7 +76,7 @@ function(dfu_app_zip_package)
         "${net_update_name}board=${net_core_board}"
         "${net_update_name}soc=${SB_CONFIG_SOC}"
        )
-    list(APPEND bin_files "signed_by_mcuboot_and_b0_${image_name}.bin")
+    list(APPEND bin_files "${CMAKE_BINARY_DIR}/signed_by_mcuboot_and_b0_${image_name}.bin")
     list(APPEND zip_names "${net_update_name}")
     list(APPEND signed_targets ${image_name}_extra_byproducts ${image_name}_signed_packaged_target)
   endif()
@@ -99,7 +108,7 @@ function(dfu_app_zip_package)
     include(${ZEPHYR_NRF_MODULE_DIR}/cmake/fw_zip.cmake)
 
     generate_dfu_zip(
-      OUTPUT ${PROJECT_BINARY_DIR}/dfu_application.zip
+      OUTPUT ${CMAKE_BINARY_DIR}/dfu_application.zip
       BIN_FILES ${bin_files}
       ZIP_NAMES ${zip_names}
       TYPE application

subsys/bootloader/cmake/packaging.cmake

@@ -25,17 +25,17 @@ if(SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD)
     get_property(image_name GLOBAL PROPERTY DOMAIN_APP_CPUNET)
     list(APPEND dfu_multi_image_ids 1)
     if(SB_CONFIG_BOOTLOADER_MCUBOOT)
-      list(APPEND dfu_multi_image_paths "${PROJECT_BINARY_DIR}/signed_by_mcuboot_and_b0_${image_name}.bin")
+      list(APPEND dfu_multi_image_paths "${CMAKE_BINARY_DIR}/signed_by_mcuboot_and_b0_${image_name}.bin")
       list(APPEND dfu_multi_image_targets ${image_name}_extra_byproducts ${image_name}_signed_kernel_hex_target ${image_name}_signed_packaged_target)
     else()
-      list(APPEND dfu_multi_image_paths "${PROJECT_BINARY_DIR}/signed_by_b0_${image_name}.bin")
+      list(APPEND dfu_multi_image_paths "${CMAKE_BINARY_DIR}/signed_by_b0_${image_name}.bin")
       list(APPEND dfu_multi_image_targets ${image_name}_extra_byproducts ${image_name}_signed_kernel_hex_target)
     endif()
   endif()
 
   if(SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_MCUBOOT)
     list(APPEND dfu_multi_image_ids -2 -1)
-    list(APPEND dfu_multi_image_paths "${PROJECT_BINARY_DIR}/signed_by_mcuboot_and_b0_mcuboot.bin" "${PROJECT_BINARY_DIR}/signed_by_mcuboot_and_b0_s1_image.bin")
+    list(APPEND dfu_multi_image_paths "${CMAKE_BINARY_DIR}/signed_by_mcuboot_and_b0_mcuboot.bin" "${CMAKE_BINARY_DIR}/signed_by_mcuboot_and_b0_s1_image.bin")
     list(APPEND dfu_multi_image_targets mcuboot_extra_byproducts mcuboot_signed_kernel_hex_target s1_image_extra_byproducts s1_image_signed_kernel_hex_target mcuboot_signed_packaged_target s1_image_signed_packaged_target)
   endif()
 
@@ -46,15 +46,15 @@ if(SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD)
       list(APPEND dfu_multi_image_ids 1)
     endif()
 
-    list(APPEND dfu_multi_image_paths "${PROJECT_BINARY_DIR}/nrf70.signed.bin")
+    list(APPEND dfu_multi_image_paths "${CMAKE_BINARY_DIR}/nrf70.signed.bin")
     list(APPEND dfu_multi_image_targets nrf70_wifi_fw_patch_target)
   endif()
 
   if(DEFINED dfu_multi_image_targets)
     dfu_multi_image_package(dfu_multi_image_pkg
       IMAGE_IDS ${dfu_multi_image_ids}
       IMAGE_PATHS ${dfu_multi_image_paths}
-      OUTPUT ${PROJECT_BINARY_DIR}/dfu_multi_image.bin
+      OUTPUT ${CMAKE_BINARY_DIR}/dfu_multi_image.bin
       DEPENDS ${dfu_multi_image_targets}
       )
   else()
@@ -81,7 +81,7 @@ if(CONFIG_ZIGBEE AND CONFIG_ZIGBEE_FOTA)
     set(firmware_binary "${${DEFAULT_IMAGE}_image_dir}/zephyr/${${DEFAULT_IMAGE}_kernel_name}.signed.bin")
     set(legacy_cmd "--legacy")
   elseif(SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD)
-    set(firmware_binary "${PROJECT_BINARY_DIR}/dfu_multi_image.bin")
+    set(firmware_binary "${CMAKE_BINARY_DIR}/dfu_multi_image.bin")
     set(legacy_cmd)
   else()
     message(WARNING "No Zigbee FOTA image format selected. Please enable either legacy or the multi-image format.")
@@ -99,7 +99,7 @@ if(CONFIG_ZIGBEE AND CONFIG_ZIGBEE_FOTA)
         --zigbee-comment ${CONFIG_ZIGBEE_FOTA_COMMENT}
         --zigbee-ota-min-hw-version ${CONFIG_ZIGBEE_FOTA_MIN_HW_VERSION}
         --zigbee-ota-max-hw-version ${CONFIG_ZIGBEE_FOTA_MAX_HW_VERSION}
-        --out-directory ${PROJECT_BINARY_DIR}
+        --out-directory ${CMAKE_BINARY_DIR}
         ${legacy_cmd}
 
       DEPENDS

tests/subsys/bluetooth/mesh/metadata_extraction/sysbuild.cmake

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-set(script_args ${PROJECT_BINARY_DIR})
+set(script_args ${CMAKE_BINARY_DIR})
 
 if(SB_CONFIG_COMP_DATA_LAYOUT_SINGLE)
   list(PREPEND script_args --single)

west.yml

@@ -63,7 +63,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: d21c2b944027ef7bd40117eeadfcf4008a3b7f3e
+      revision: e4277b033cd63fa6240f2451366640cf28d48b5f
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above