west update of ncs v2.2.0 fail

[ziv123]

hello Nordic

i am currently working with ncsv1.9.2 with toochain v2.1.2

for a small project i needed more undated version of ncs (specifically to get the ability to pass over all nodes in dts with macro DT_FOREACH_NODE )

anyway, after moving to ncs v2.2.0 branch and doing west update i get the following error: ' ERROR: update failed for project hal_nordic ' 

any idea what is the source of this error and how to fix it ?

also, tryed to build my app and ignore this error i suddenly get that 'zephyr.h' is not found, is it related ? what can be the reason for that ?

(p.s. the zehpyr.h is there and another project that uses it builds fine, i tried to look in CMakeLists.txt but did not find something that can explain this)

hope to read from you soon

best regards

Ziv

[Marte Myrvold]

Hi Ziv,

after moving to ncs v2.2.0 branch and doing west update i get the following error: ' ERROR: update failed for project hal_nordic ' 

There should be an error in the log during the step to update hal_nordic stating the problem. Please post the entire log from when you run west update.

also, tryed to build my app and ignore this error i suddenly get that 'zephyr.h' is not found, is it related ? what can be the reason for that ?

To fix this issue, add zephyr/ as a prefix to the include path:

#include <zephyr/zephyr.h>

This is due to a change in Zephyr where all public headers were moved to include/zephyr. For more information, you can look at the Zephyr 3.1.0 Release Notes.

Best regards,
Marte

[ziv123]

hi Marte

Marte Myrvold said:

Please post the entire log from when you run west update.

west update
=== updating zephyr (zephyr):
Previous HEAD position was b05b8ad63a [nrf fromtree] board: thingy53_nrf5340: Add option to set PMIC to PWM mode
HEAD is now at c0689b16ff [nrf fromlist] lib: newlib: Define _ANSI_SOURCE
=== updating sdk-hostap (modules/lib/hostap):
HEAD is now at 49fddb8f5 Fix handling connection timeout equal to 0
=== updating mcuboot (bootloader/mcuboot):
Previous HEAD position was 17f6d045 [nrf noup] loader: fixed the check of reset address for the net app
HEAD is now at 78fd7ff9 [nrf fromlist] boot_serial: Fix rc not being returned as a signed value
=== updating mbedtls-nrf (mbedtls):
Previous HEAD position was cefdd9954 [nrf noup] Add driver_wrapper call for derivation
HEAD is now at 89419b374 [nrf noup] Constant size for psa_core_key_attributes_t struct
=== updating nrfxlib (nrfxlib):
Previous HEAD position was 541341f0 doc: Remove Doc changes
HEAD is now at 03d0965d doc: Update versions for 2.2.0 release
=== updating trusted-firmware-m (modules/tee/tf-m/trusted-firmware-m):
Previous HEAD position was c6667fa3 [nrf fromtree] platform: nordic_nrf: Add missing NRF_SKIP_FICR_NS_COPY_TO_RAM
HEAD is now at 4a929712 [nrf fromlist]: Do not attempt to reset locked regions
=== updating tfm-mcuboot (modules/tee/tfm-mcuboot):
HEAD is now at 4aa516e7 Bump versions for v1.7.2
=== updating matter (modules/lib/matter):
M       third_party/pigweed/repo
Previous HEAD position was ec9e7f67a [nrf noup] [SED] Review switching between polling modes - update
HEAD is now at f4a75a5dc [nrf noup] config: nrfconnect: Define _DEFAULT_SOURCE
Synchronizing submodule url for 'third_party/nlio/repo'
Synchronizing submodule url for 'third_party/nlassert/repo'
Synchronizing submodule url for 'third_party/nlunit-test/repo'
Synchronizing submodule url for 'third_party/pigweed/repo'
Submodule path 'third_party/pigweed/repo': checked out '9235aeb653e684a6f0b7b563965d85c747281a0f'
=== updating cjson (modules/lib/cjson):
HEAD is now at c6af068 [nrf fromtree] fix: potential memory leak in merge_patch() (#611)
=== updating azure-sdk-for-c (modules/lib/azure-sdk-for-c):
HEAD is now at 308c171c [nrf fromlist] Make repository a Zephyr module
=== updating cmock (test/cmock):
M       vendor/unity
Previous HEAD position was 9d09289 Merge pull request #346 from ThrowTheSwitch/reapply_329
HEAD is now at f65066f Merge pull request #404 from tz18/patch-1
Synchronizing submodule url for 'vendor/c_exception'
Synchronizing submodule url for 'vendor/unity'
From https://github.com/throwtheswitch/unity
 * branch            HEAD       -> FETCH_HEAD
From https://github.com/throwtheswitch/unity
 * branch            4389bab82ee8a4b4631a03be2e07dd5c67dab2d4 -> FETCH_HEAD
Submodule path 'vendor/unity': checked out '4389bab82ee8a4b4631a03be2e07dd5c67dab2d4'
=== updating memfault-firmware-sdk (modules/lib/memfault-firmware-sdk):
Previous HEAD position was 2fe5ba1 Memfault Firmware SDK 0.28.2 (Build 384364)
HEAD is now at d7ed96d Memfault Firmware SDK 0.35.0 (Build 615)
=== updating cirrus (modules/hal/cirrus-logic):
HEAD is now at 9f6b381 sdk-mcu-drivers: Added build system configs and generated files
=== updating openthread (modules/lib/openthread):
Previous HEAD position was 02e61a2ed [nrf noup] allow link metrics series for all children
HEAD is now at 0759de4fc [dependabot] update commit message prefix (#8457)
=== updating canopennode (modules/lib/canopennode):
Previous HEAD position was 1052dae Merge pull request #4 from vestas-wind-systems/mergeup-2021-10-29
HEAD is now at 53d3415 Merge pull request #5 from teslabs/module-name
=== updating chre (modules/lib/chre):
HEAD is now at ef76d345 Merge pull request #4 from fabiobaltieri/chre-uprev
=== updating cmsis (modules/hal/cmsis):
Previous HEAD position was b0612c9 DSP: Integrate CMSIS-DSP 1.9.0 (CMSIS 5.8.0)
HEAD is now at 093de61 DSP: Fix uninitialised variable references reported by GCC 12
=== updating edtt (tools/edtt):
Warning: you are leaving 6 commits behind, not connected to
any of your branches:

  c94f638 Replaced 'white list' and variations thereof with 'filter accept list'
  8579682 Renamed .csv file to be conform with inclusive naming
  add1cc9 Inclusive naming changes: 'master' is replaced with 'central' 'slave' is replaced with 'peripheral' 'wl' is replaced with 'fal' (filtered accept list) 'whitelist' is replaced with 'acceptlist'
  1e78386 Remove trailing whitespace from the python scripts.
 ... and 2 more.

If you want to keep them by creating a new branch, this may be a good time
to do so with:

 git branch <new-branch-name> c94f638

HEAD is now at 1ea61a3 Fixing error in DLE test cases
=== updating fatfs (modules/fs/fatfs):
Previous HEAD position was 94fcd6b fs: Update driver to version 0.14b
HEAD is now at a30531a zephyr: update include paths to use <zephyr/...>
=== updating hal_nordic (modules/hal/nordic):
error: Your local changes to the following files would be overwritten by checkout:
        nrfx/drivers/src/nrfx_timer.c
Please commit your changes or stash them before you switch branches.
Aborting
=== updating hal_st (modules/hal/st):
Previous HEAD position was 575de9d sensor/stmemsc: Align stmemsc i/f to v2.00
HEAD is now at cccbc24 sensor: lsm6dso: Disable -Wmaybe-uninitialized for lsm6dso_mode_set
=== updating hal_wurthelektronik (modules/hal/wurthelektronik):
HEAD is now at 24ca987 Initialized WE HAL module repository.
=== updating libmetal (modules/hal/libmetal):
Previous HEAD position was f237c9d lib: update libmetal to release v2021.10.0
HEAD is now at 2f586b4 lib: update libmetal to SHA 23ba77941cf3
=== updating liblc3 (modules/lib/liblc3):
HEAD is now at 448f3de Merge pull request #8 from carlescufi/rename
=== updating littlefs (modules/fs/littlefs):
Previous HEAD position was 33509ed Merge pull request #7 from poojamg/littlefs_rev2.4.1
HEAD is now at ca583fd Merge tag 'v2.5.0' of https://github.com/littlefs-project/littlefs into zephyr
=== updating loramac-node (modules/lib/loramac-node):
Warning: you are leaving 2 commits behind, not connected to
any of your branches:

  12019623 zephyr: radio: sx127x: override buffer read/write functions
  cf5e2aa9 zephyr: add module.yml

If you want to keep them by creating a new branch, this may be a good time
to do so with:

 git branch <new-branch-name> 12019623

HEAD is now at ce57712f Don't memset the TXRX buffer when radio is set to receive mode (#1345)
=== updating lvgl (modules/lib/gui/lvgl):
Previous HEAD position was 783c1f78 cmake: added missing file ext to lv_font_dejavu_16_persian_hebrew.c
HEAD is now at 5ab83099 zephyr: add missing errno.h include
=== updating lz4 (modules/lib/lz4):
HEAD is now at 8e303c2 zephyr: make this repo a zephyr module
=== updating mbedtls (modules/crypto/mbedtls):
Previous HEAD position was 3e3e58a92 mbedtls: remove static keyword from certain function pointers
HEAD is now at 7fed49c9b CC3XX: Hardcode entry points for the CC3XX driver
=== updating mipi-sys-t (modules/debug/mipi-sys-t):
Previous HEAD position was 75e6715 zephyr: move platform.h to zephyr tree
HEAD is now at 0d521d8 mipi_syst_api.c: Change MIPI_SYST_PCFG_PRINTF_ARGBUF_SIZE macro.
=== updating nanopb (modules/lib/nanopb):
Previous HEAD position was d148bd2 Add zephyr module support
HEAD is now at dc4deed Merge pull request #1 from pdgendt/zephyr
=== updating net-tools (tools/net-tools):
Previous HEAD position was f49bd13 net-capture: Listen captured traffic and save to pcap file
HEAD is now at e0828aa net-setup: Add instructions for NAT and routing
=== updating nrf_hw_models (modules/bsim_hw_models/nrf_hw_models):
Previous HEAD position was b8cea37 Added overflow event handling and trigger overflow task
HEAD is now at 65bc530 irq_ctrl: Add support for level interrupts
=== updating open-amp (modules/lib/open-amp):
Previous HEAD position was cfd050f lib: update open-amp lib to release v2021.10.0
HEAD is now at 8d53544 lib: update open-amp lib to release v2022.04.0
=== updating picolibc (modules/lib/picolibc):
HEAD is now at 04ada5951 Version 1.7.8
=== updating segger (modules/debug/segger):
Previous HEAD position was 3a52ab2 config: Use zephyr provided options
HEAD is now at d4e568a Resolve circular include dependencies
=== updating tinycbor (modules/lib/tinycbor):
Previous HEAD position was 40daca9 zephyr: Remove TINYCBOR from interface libraries
HEAD is now at 9e1f34b module: Deprecate TinyCBOR
=== updating tinycrypt (modules/crypto/tinycrypt):
HEAD is now at 3e9a49d cmake: Fix conditional in root CMakeLists.txt
=== updating TraceRecorderSource (modules/debug/TraceRecorder):
Previous HEAD position was 36c5777 Merge remote-tracking branch 'upstream/main' into zephyr
HEAD is now at 9893bf1 Merge pull request #8 from tleksell-pe/trace_recorder_4.6.3_update
=== updating tf-m-tests (modules/tee/tf-m/tf-m-tests):
Previous HEAD position was 5281418 Merge pull request #1 from SebastianBoe/merge_tfm-1.5
HEAD is now at bcb53bc Merge pull request #4 from joerchan/tfm-library-mode-invalid-data-length-zephyr
=== updating psa-arch-tests (modules/tee/tf-m/psa-arch-tests):
Previous HEAD position was 0aab246 Merge pull request #2 from joerchan/fix-wdt-build-issues
HEAD is now at f4fc244 Merge pull request #5 from Vge0rge/increase_crypto_timeout
=== updating uoscore-uedhoc (modules/lib/uoscore-uedhoc):
HEAD is now at e892019 Merge pull request #11 from rlubos/zephyr-integration
=== updating zcbor (modules/lib/zcbor):
HEAD is now at 0556eda Update version from 0.5.99 to 0.6.0
=== updating zscilib (modules/lib/zscilib):
Previous HEAD position was 12bfe3f Merge pull request #28 from microbuilder/doccleanup
HEAD is now at ca070dd Merge pull request #39 from microbuilder/fix_tests_cmake
ERROR: update failed for project hal_nordic

[Marte Myrvold]

Hi,

From the log, I see that you have changed the nrfx_timer.c file:

=== updating hal_nordic (modules/hal/nordic):

error: Your local changes to the following files would be overwritten by checkout:

nrfx/drivers/src/nrfx_timer.c

Please commit your changes or stash them before you switch branches.

Aborting

The repository cannot be updated when local changes are made to a file. I recommend not changing the files in the SDK unless completely necessary, but if you need to make changes, you should follow this guide Adding your own code.

If the changes are not important and you do not want to keep them, then you can do the following to solve this issue:

• Open a terminal and go to <NCS_ROOT>/modules/hal/nordic inside the terminal.
• Run the command 'git stash'

This should revert the changes made to nrfx_timer.c, and hal_nordic should be updated correctly the next time you run 'west update'.

Best regards,
Marte