Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upmerge 20231208 #1422

Closed
wants to merge 5,446 commits into from
Closed

Upmerge 20231208 #1422

wants to merge 5,446 commits into from

Conversation

de-nordic
Copy link
Contributor

No description provided.

… usage"

This reverts commit bce70f4.

Signed-off-by: Dominik Ermel <[email protected]>
…CCM subscribe clear"

This reverts commit 2528d7a.

Signed-off-by: Dominik Ermel <[email protected]>
…n scan aux code"

This reverts commit ac999bd.

Signed-off-by: Dominik Ermel <[email protected]>
… header minor updates"

This reverts commit 5b8de9b.

Signed-off-by: Dominik Ermel <[email protected]>
…guration cleanup"

This reverts commit 65eaabb.

Signed-off-by: Dominik Ermel <[email protected]>
…onfiguration"

This reverts commit 694b89f.

Signed-off-by: Dominik Ermel <[email protected]>
…ngle timer id regression"

This reverts commit c3bc6fa.

Signed-off-by: Dominik Ermel <[email protected]>
…l header"

This reverts commit 5d1edf1.

Signed-off-by: Dominik Ermel <[email protected]>
… only code"

This reverts commit 6a7a93c.

Signed-off-by: Dominik Ermel <[email protected]>
…OMPATIBLE"

This reverts commit cd06b1c.

Signed-off-by: Dominik Ermel <[email protected]>
…e reset"

This reverts commit 0cbe44c.

Signed-off-by: Dominik Ermel <[email protected]>
…te PER CIS active set"

This reverts commit ca85f44.

Signed-off-by: Dominik Ermel <[email protected]>
… CIS Established Event"

This reverts commit 18f4f85.

Signed-off-by: Dominik Ermel <[email protected]>
…uling Broadcast ISO"

This reverts commit 5f4e7b0.

Signed-off-by: Dominik Ermel <[email protected]>
…th and preempt PTO & CTRL"

This reverts commit 15f89d6.

Signed-off-by: Dominik Ermel <[email protected]>
… event overheads"

This reverts commit 5066d19.

Signed-off-by: Dominik Ermel <[email protected]>
…nc_iso_created()"

This reverts commit 46a5b07.

Signed-off-by: Dominik Ermel <[email protected]>
…TART_US for Coded PHY"

This reverts commit 0649129.

Signed-off-by: Dominik Ermel <[email protected]>
…r_job() on Extended Scan"

This reverts commit c86add5.

Signed-off-by: Dominik Ermel <[email protected]>
…e iteration code"

This reverts commit 290662f.

Signed-off-by: Dominik Ermel <[email protected]>
…many enqueued in pipeline"

This reverts commit 3cefcc0.

Signed-off-by: Dominik Ermel <[email protected]>
…se in Observer"

This reverts commit 368963a.

Signed-off-by: Dominik Ermel <[email protected]>
…et to check short prepare"

This reverts commit 146b77c.

Signed-off-by: Dominik Ermel <[email protected]>
…m in prepare pipeline"

This reverts commit cb9acc3.

Signed-off-by: Dominik Ermel <[email protected]>
…_dequeue for skipped events""

This reverts commit 1d6f341.

Signed-off-by: Dominik Ermel <[email protected]>
…m Cmd invalid status"

This reverts commit 4af5170.

Signed-off-by: Dominik Ermel <[email protected]>
…meout requested flag"

This reverts commit 8246e66.

Signed-off-by: Dominik Ermel <[email protected]>
de-nordic and others added 28 commits December 11, 2023 20:12
This reverts commit 9b9ec58.

Signed-off-by: Dominik Ermel <[email protected]>
This reverts commit ed6a204.

Signed-off-by: Dominik Ermel <[email protected]>
Update sdk-zephyr to the latest code in upstream Zephyr.

Signed-off-by: Dominik Ermel <[email protected]>
This file is used for NCS-specific testing configuration based on
modifications to files in this repository.

Signed-off-by: Alperen Sener <[email protected]>
Signed-off-by: Elisabeth Solheim Klakken <[email protected]>
Signed-off-by: Mariusz Poslinski <[email protected]>
Signed-off-by: Markus Swarowsky <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
Signed-off-by: Sebastian Wezel <[email protected]>
Signed-off-by: Tomasz Tyzenhauz <[email protected]>
Signed-off-by: Fredrik Ås <[email protected]>
Signed-off-by: Michał Szablowski <[email protected]>
Signed-off-by: Tony Le <[email protected]>
Signed-off-by: Krishna T <[email protected]>
(cherry picked from commit 2a59fbd)
(cherry picked from commit acb96b1)
(cherry picked from commit e102ad1)
(cherry picked from commit f9eac37)
(cherry picked from commit ed6a204)
Signed-off-by: Dominik Ermel <[email protected]>
Necessary changes for NCS CI.

- Add a Jenkinsfile
- compliance.yml: Disable check for merge commits, since we have upmerges
  downstream.
  Add an additional check for sauce tags (details in scripts/gitlint)
  Also, since in the code we refer to Kconfig symbols that are defined
  in the sdk-nrf repository, the Kconfig checks (Kconfig and
  KconfigBasic) will not pass so exclude them.
- Extend the max commit line lengths for Gitlint to account for sauce
  tags
- Add a commit-tags workflow: This enables sauce tag checking in sdk-zephyr
- scripts/gitlint: Add support for sauce tags checks. In order to not
  interfere with CI in other repos (namely sdk-nrf) this is run as an
  independent gitlint invocation and not as part of check_compliance.py.
  This invocation enables the ncs-sauce-tags rule and, since it runs
  before rebasing and thus will run on merge commits, disables the
  title-starts-with-subsystem rule by setting a catch-all regex.

Signed-off-by: Carles Cufi <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
Signed-off-by: Martí Bolívar <[email protected]>
Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Signed-off-by: Krishna T <[email protected]>
(cherry picked from commit d34b035)
(cherry picked from commit 4a6d5fc)
(cherry picked from commit a01c3a4)
(cherry picked from commit 9b9ec58)
Signed-off-by: Dominik Ermel <[email protected]>
This is a long-term noup patch because driver support is NCS-only.

Set HAS_HW_NRF_CC3XX to be defined in NS build when cryptocell
is accessed through the PSA API.
We need to know which CC3XX features are available.

Signed-off-by: Georgios Vasilakis <[email protected]>
Signed-off-by: Joakim Andersson <[email protected]>
(cherry picked from commit c76cf87)
(cherry picked from commit 214533f)
(cherry picked from commit 3819c4a)
(cherry picked from commit 910bb5f)
Signed-off-by: Dominik Ermel <[email protected]>
This is a follow-up to commit 9dd570f.

Since in NCS, unlike in vanilla Zephyr, the nano variant of newlib
is the default one, restore entries that disable the nano variant
in one sample and one test that require the full newlib variant.
This patch is supposed to be removed when picolibc becomes the default.

Signed-off-by: Andrzej Głąbek <[email protected]>
(cherry picked from commit 5620420)
(cherry picked from commit 4edd368)
(cherry picked from commit 9eb6436)
Signed-off-by: Dominik Ermel <[email protected]>
Friend's replies on LPN's polls do not assume randomization in
advertiser. Zero randomization will help to optimize time when
LPN keeps receiving window open and save power.

Signed-off-by: Aleksandr Khromykh <[email protected]>
(cherry picked from commit 88d5ef9)
(cherry picked from commit a5ab323)
(cherry picked from commit 4680099)
Signed-off-by: Dominik Ermel <[email protected]>
Fixes issue where randomness can be removed for advertising sets that
have to handle other adv types than the BT_MESH_FRIEND_ADV tag type.

Signed-off-by: Anders Storrø <[email protected]>
(cherry picked from commit f8f1133)
(cherry picked from commit 996037d)
(cherry picked from commit 62a4cad)
Signed-off-by: Dominik Ermel <[email protected]>
Bring back parallel execution to the clang action. In the upstream
they went to use a single dedicated powerful agent to run this. We
need to keep this as we have to base on agents available in github's
cloud.

zephyr_runner is upstream's proprietary agent inaccessible outside of
upstream's CI. Use ubuntu-latest instead.

Signed-off-by: Maciej Perkowski <[email protected]>
Signed-off-by: Gerard Marull-Paretas <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Tomasz Moń <[email protected]>
Signed-off-by: Stephanos Ioannidis <[email protected]>
Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
(cherry picked from commit 5b3d0ff)
(cherry picked from commit 5e2f4ec)
(cherry picked from commit 0948638)
(cherry picked from commit 4d76b6a)
Signed-off-by: Dominik Ermel <[email protected]>
Extend sdk-zephyr CI with FEM test label.

Signed-off-by: Dawid Przybylo <[email protected]>
(cherry picked from commit d2bc2c3)
(cherry picked from commit f3aa712)
Signed-off-by: Dominik Ermel <[email protected]>
There is no need to run those for all PRs.
For example: When there are only changes to Bluetooth, we don't
want this CI to run.

Adding these filters may speedup the time to merge for PRs to sdk-nrf

Signed-off-by: Rubin Gerritsen <[email protected]>
(cherry picked from commit 78106c7)
(cherry picked from commit d44fdf9)
Signed-off-by: Dominik Ermel <[email protected]>
Thingy91 CI tests dependencies added.

Signed-off-by: Jørgen Kvalvaag <[email protected]>
(cherry picked from commit 6a0df6f)
(cherry picked from commit 00175bd)
Signed-off-by: Dominik Ermel <[email protected]>
Extended the github CI filter for crypto and TF-M tests to
reduce the CI load and possibly speed up PRs.

Signed-off-by: Magne Værnes <[email protected]>
(cherry picked from commit c0d21ea)
(cherry picked from commit fe45e34)
Signed-off-by: Dominik Ermel <[email protected]>
Add Sidewalk to be trigger on changes in this repo.
Correct entry path for hci_rpmsg samples for Matter and Homekit.

Signed-off-by: Tomasz Tyzenhauz <[email protected]>
(cherry picked from commit cd4e36f)
(cherry picked from commit 090fedd)
Signed-off-by: Dominik Ermel <[email protected]>
Add BLE CI test dependency and update the include path of mesh.

Signed-off-by: Lang Xie <[email protected]>
(cherry picked from commit 0295622)
(cherry picked from commit d6bb133)
Signed-off-by: Dominik Ermel <[email protected]>
Update Thread test-spec entry.

Signed-off-by: Mariusz Poslinski <[email protected]>
(cherry picked from commit 81c640b)
(cherry picked from commit 6340dae)
Signed-off-by: Dominik Ermel <[email protected]>
Update Thread and HomeKit test-spec entries.

Signed-off-by: Mariusz Poslinski <[email protected]>
(cherry picked from commit 4c741f1)
(cherry picked from commit 4887164)
Signed-off-by: Dominik Ermel <[email protected]>
The commit adds bootutil hook, for nrf5340, to allow it
handling the non-accessible image-1/primary slot.

Signed-off-by: Andrzej Głąbek <[email protected]>
Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Signed-off-by: Johann Fischer <[email protected]>
(cherry picked from commit 840b8fa)
(cherry picked from commit 9af7d7a)
(cherry picked from commit 298d803)
(cherry picked from commit d3aa849)
(cherry picked from commit 063b584)
Signed-off-by: Dominik Ermel <[email protected]>
Partition Manager (PM) is a component of the nRF Connect SDK (NCS)
which uses yaml files to resolve flash partition placement with a
holistic view of the entire device, including each firmware image
present on the flash device, and various subsystems, such as settings
and NFFS.

When this NCS extension is used, various source files which would use
partition information from devicetree in "vanilla" zephyr instead use
defines generated by PM instead.

This commit removes support for HEX_FILES_TO_MERGE, as it conflicts
with PM.

The settings subsystem pm.yml defines a partition 'settings_storage'.
The nffs subsystem pm.yml defines 'nffs_storage'.

Leverage label translation to avoid patching partition names.

Refer to the NCS documentation page for this feature for more details.

This is a long-running out of tree patch which has been worked on by
several people. The following sign-offs are in alphabetical order by
first name.

Signed-off-by: Andrzej Głąbek <[email protected]>
Signed-off-by: Andrzej Puzdrowski <[email protected]>
Signed-off-by: Håkon Øye Amundsen <[email protected]>
Signed-off-by: Ioannis Glaropoulos <[email protected]>
Signed-off-by: Joakim Andersson <[email protected]>
Signed-off-by: Johann Fischer <[email protected]>
Signed-off-by: Martí Bolívar <[email protected]>
Signed-off-by: Ole Sæther <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
Signed-off-by: Sebastian Bøe <[email protected]>
Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Thomas Stenersen <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Øyvind Rønningstad <[email protected]>
Signed-off-by: Trond Einar Snekvik <[email protected]>
Signed-off-by: Gerard Marull-Paretas <[email protected]>
Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit ba54fe8)
(cherry picked from commit 68110ee)
(cherry picked from commit 12d1ebf)
(cherry picked from commit 5e8e748)
(cherry picked from commit d1fa3da)
Signed-off-by: Dominik Ermel <[email protected]>
Move it inside ifdef.

(cherry picked from commit 2fb8d76)
(cherry picked from commit 45ac1f8)
Signed-off-by: Dominik Ermel <[email protected]>
HomeKit Accessory Development Kit has been deprecated and removed
from NCS.

Signed-off-by: Mariusz Poslinski <[email protected]>
(cherry picked from commit fabddf3)
Signed-off-by: Dominik Ermel <[email protected]>
- Add filter for audio tests

Signed-off-by: Alexander Svensen <[email protected]>
(cherry picked from commit 2b1d418)
Signed-off-by: Dominik Ermel <[email protected]>
CI-run-zephyr-twister is used to determine if twister tests from
sdk-zephyr should be run on PR to sdk-nrf repository.

Signed-off-by: Jan Gałda <[email protected]>
(cherry picked from commit ede8612)
Signed-off-by: Dominik Ermel <[email protected]>
Usage of the Softdevice specific api has been adapted
to upstream adv changes.

Signed-off-by: Aleksandr Khromykh <[email protected]>
(cherry picked from commit 533baa1)
Signed-off-by: Dominik Ermel <[email protected]>
This patch backports the nrf9131ek to a time before tfm was refactored.

To be reverted when TF-M is updated.

Signed-off-by: Maximilian Deubel <[email protected]>
(cherry picked from commit 6755c47)
Signed-off-by: Dominik Ermel <[email protected]>
This patch backports the nrf9131ek docs.

To be reverted when after the next Zephyr update.

Signed-off-by: Maximilian Deubel <[email protected]>
(cherry picked from commit 56f475a)
Signed-off-by: Dominik Ermel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.