Skip to content

Commit

Permalink
manifest: Update zephyr
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
57300 authored and rlubos committed Jul 17, 2024
1 parent 9ca356c commit 56ec565
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
9 changes: 2 additions & 7 deletions cmake/sysbuild/nrf700x.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 56ec565

Please sign in to comment.