From 56ec5656a033ab12041abb380be0ab8438f9a90d Mon Sep 17 00:00:00 2001 From: Grzegorz Swiderski Date: Fri, 5 Jul 2024 17:36:28 +0200 Subject: [PATCH] manifest: Update zephyr Pull in SoC and board extensions support, and the `sysbuild_dt_*` API, the latter of which can be applied immediately. Signed-off-by: Grzegorz Swiderski --- cmake/sysbuild/nrf700x.cmake | 9 ++------- west.yml | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cmake/sysbuild/nrf700x.cmake b/cmake/sysbuild/nrf700x.cmake index 324c2f2221c..77edb6a6801 100644 --- a/cmake/sysbuild/nrf700x.cmake +++ b/cmake/sysbuild/nrf700x.cmake @@ -5,13 +5,8 @@ # function(setup_nrf700x_xip_data) - include(${CMAKE_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr/dts.cmake) - - get_target_property(qspi_nodelabel devicetree_target "DT_NODELABEL|qspi") - get_target_property(qspi_device devicetree_target "DT_REG|${qspi_nodelabel}|ADDR") - get_target_property(qspi_modes devicetree_target "DT_PROP|${qspi_nodelabel}|reg-names") - list(FIND qspi_modes "qspi_mm" qspi_mm_mode_position) - list(GET qspi_device "${qspi_mm_mode_position}" qspi_xip_address) + sysbuild_dt_nodelabel(qspi_nodelabel IMAGE ${DEFAULT_IMAGE} NODELABEL "qspi") + sysbuild_dt_reg_addr(qspi_xip_address IMAGE ${DEFAULT_IMAGE} PATH "${qspi_nodelabel}" NAME "qspi_mm") set(OS_AGNOSTIC_BASE ${ZEPHYR_NRFXLIB_MODULE_DIR}/nrf_wifi) diff --git a/west.yml b/west.yml index dff33722ba9..b33f4e163b8 100644 --- a/west.yml +++ b/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: daf34bbdbca42902c2a1580d23b93bd4b34547ee + revision: 0439c7a202372dad8b441c6b81509f04f6e751b1 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above