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.

Sign up for GitHub

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

Jump to bottom

[DNM] Upmerge 20231208 #13400

Closed
wants to merge 78 commits into from
Closed

[DNM] Upmerge 20231208 #13400

wants to merge 78 commits into from

Conversation

de-nordic
Copy link
Contributor

No description provided.

de-nordic and others added 30 commits December 11, 2023 19:48
@de-nordic
manifest: Update upmerged respositories
47af7de 
Upmerging:
  - sdk-mcuboot to 212997395ed34ff1721f5f4461b800e81abeb68d
  - sdk-zephyr to 0880dbe

Updating:
  - sdk-nrfxlib
  - sdk-connectedhomeip
  - find-my
  - hostap
  - memfault
  - sidewalk

Signed-off-by: Dominik Ermel <[email protected]>
@de-nordic
treewide: Use toolchain.h instead of toolchain-specific headers
4c43e9a 
Fix required by introduction of upstream Zephyr commit
6ee650a.

Signed-off-by: Dominik Ermel <[email protected]>
@de-nordic
tests: Remove CONFIG_ZTEST_NEW_API=y
c4160b2 
The new API is default now and the symbol does not exist anymore.

Signed-off-by: Dominik Ermel <[email protected]>
@de-nordic
treewide: Remove dependency on no longer existing Kconfigs
e67954b 
The Zephyr commit 104ea2c
removed:
 CONFIG_CMSIS_DSP_FASTMATH
 CONFIG_CMSIS_DSP_TABLES

Signed-off-by: Dominik Ermel <[email protected]>
@de-nordic
treewide: Replace rand32.h with random.h
499d114 
Upstream Zephyr commit e7bd10a
renamed the file from rand32.h to random.h.

Signed-off-by: Dominik Ermel <[email protected]>
@de-nordic
bluetooth: gatt_dm: Remove k_mem_block_id with k_heap
bf9eca4 
The k_mem_block_id has been removed with
8a6aee9
and it is replaced with k_heap * in similar way as in the commit
9413922

Signed-off-by: Dominik Ermel <[email protected]>
@de-nordic
modules: tf-m: Use tf-m instead of Zephyr headers.
272c244 
Toolchain header has been replaced with utilities.h.

Fix required by introduction of upstream Zephyr commit
6ee650a

Signed-off-by: Dominik Ermel <[email protected]>
@de-nordic
zephyr: Realign to new k_mem_slab definition
5724cba 
Block size has been moved under k_mem_slab_info type info pointer
within k_mem_slab structure by Zephyr commit:
2f003e5

Signed-off-by: Dominik Ermel <[email protected]>
@de-nordic
treewide: Use Zephyr time definitions
3915d16 
Use time definitions from Zephyr.

Signed-off-by: Dominik Ermel <[email protected]>
@nordicjm @de-nordic
treewide: Replace hci_rpmsg with hci_ipc
77122ed 
Updates the hci_rpmsg application name with hci_ipc, which was
updated in zephyr

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
manifest: Add cmsis-dsp and cmsis-nn to allow list
2a526b1 
Allows fetching the cmsis-dsp and cmsis-nn modules, as these are
now split from cmsis

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
cat: modules: leds: Fix wrong work variable usage
9cf7bb5 
Fixes wrongly using work items as delayable work items

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
samples: cellular: modem_shell: Fix wrong work variable usage
226ba29 
Fixes wrongly using work items as delayable work items

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
manifest: Enable optional zephyr module group filter
94a9849 
Enables the optional module group filter so that modules that
zephyr no longer includes by default can be fetched

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
samples: bluetooth: *_uart: Update CONTAINER_OF usage
d8032ef 
Updates macro usage to fix a compilation error

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
bluetooth: services: Fix CONTAINER_OF usage
443274b 
Fixes usage of the CONTAINER_OF macro

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
drivers: wifi: nrf800x: Fix CONTAINER_OF usage
b3ae89f 
Fixes an issue with how CONTAINER_OF was used

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
net: lib: nrf_cloud: Fix define
911de56 
Updates the name of a changed define in zephyr

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
bluetooth: services: fast_pair: Fix CONTAINER_OF usage
f384ef9 
Fixes an issue with the usage of this macro

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
drivers: wifi: nrf700x: Fix CONTAINER_OF usage
f90eae8 
Fixes an issue with the usage of this macro

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
applications: serial_lte_modem: Fix macro
8b868e5 
Fixes a rename HOUR_PER_DAY macro which has changed in zephyr

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
samples: cellular: gnss: Fix macro
760fc3f 
Fixes a rename HOUR_PER_DAY macro which has changed in zephyr

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
samples: bluetooth: mesh: light_ctrl: Fix CONTAINER_OF usage
7095e9b 
Fixes an issue with the usage of this macro

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
debug: etb_trace: Remove private header from include
33b893c 
Removes a new private zephyr header from the include list

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
samples: peripheral: 802154_phy_test: Update Kconfig
cbd64af 
Updates Kconfig to replace a now removed option

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
dts: bindings: serial: ipc-uart: Fix missing pinctrl include
e980775 
Fixes a missing include of the pinctrl file which would cause use
of this to fail on the nrf5340dk

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
drivers: serial: uart_ipc: Fix CONTAINER_OF usage
8fbda4d 
Fixes an issue with the usage of this macro

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
applications: connectivity_bridge: Update for upmerge changes
f39b3e0 
Updates the application to work in the upmerge version of zephyr

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
net: lib: coap_utils: Depend upon COAP
79ded49 
Prevents a Kconfig loop by making this option just depend upon
COAP being enabled

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
lib: nrf_modem_lib: Add include path to internal socket header
8daa447 
The header file has moved in zephyr, add the new location as a
local library include

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
scripts: Update west and zephyr sdk-ng
e815bf5 
Updates west from version 1.0.0 to 1.2.0 and zephyr sdk-ng from
version 0.16.1 to 0.16.4

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
tests: lib: nrd_modem_lib: nrf91_sockets: Add header include path
cd27904 
The header file has moved in zephyr, add the new location as a
local library include

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
tests: net: lib: lwm2m: Fix misuse of wrong zephyr variable
c2457f3 
Fixes misusing the wrong zephyr directory variable

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
tests: net: lib: lwm2m_fota_utils: Add missing LwM2M version Kconfig
046bf15 
Selects the LwM2M version 1.0.0 Kconfig in this test

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
scripts: Half update toolchain versions
0bb2fde 
Updates linux/windows toolchain builds to the latest minor releases
that are available,

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
scripts: requirements-fixed: Update cryptogrpaphy and west
9e68863 
Updates the minor version of cryptograph to fix a security issue,
also updates west to the version used in the toolchain

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
applications: nrf5340_audio: Fix renamed function
ffe2e67 
Fixes a renamed function from a zephyr upmerge

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
sysbuild: netcore: Fix renamed remote core Kconfig
f17e948 
Fixes a Kconfig which has been renamed for the remote core board

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm @de-nordic
sysbuild: kconfig: Prevent PM if netcore is externally configured
cf7285b 
Prevents use of partition manager when an en external (i.e. zephyr
bluetooth) application selects the externally configured network
core image Kconfig

Signed-off-by: Jamie McCrae <[email protected]>
@github-actions github-actions bot added ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. doc-required PR must not be merged without tech writer approval. manifest labels Dec 11, 2023
@NordicBuilder
Copy link
Contributor

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
find-my https://github.com/nrfconnect/sdk-find-my/commit/65684f818fd0bc07fe8dec4f9aa6b2d9736109f9 (main) https://github.com/nrfconnect/sdk-find-my/pull/176 nrfconnect/sdk-find-my#176/files
hostap nrfconnect/sdk-hostap@006334c (main) nrfconnect/sdk-hostap#132 nrfconnect/sdk-hostap#132/files
matter nrfconnect/sdk-connectedhomeip@3b8ba59 (master) nrfconnect/sdk-connectedhomeip#345 nrfconnect/sdk-connectedhomeip#345/files
mcuboot nrfconnect/sdk-mcuboot@adab597 (main,next,upmerge-tmp) nrfconnect/sdk-mcuboot#290 nrfconnect/sdk-mcuboot#290/files
memfault-firmware-sdk memfault/[email protected] memfault/[email protected] memfault/[email protected]
nrfxlib nrfconnect/sdk-nrfxlib@a1cfe14 (main) nrfconnect/sdk-nrfxlib#1107 nrfconnect/sdk-nrfxlib#1107/files
sidewalk nrfconnect/sdk-sidewalk@acfedde nrfconnect/sdk-sidewalk#467 nrfconnect/sdk-sidewalk#467/files
zephyr nrfconnect/sdk-zephyr@b3979ec (main) nrfconnect/sdk-zephyr#1422 nrfconnect/sdk-zephyr#1422/files

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@de-nordic
mpsl: fem: require PINCTRL for nRF21540 GPIO+SPI driver
130adfd 
The current nRF21540 GPIO+SPI driver implicitly depends on PINCTRL and
relies on the end user application to configure it appropriately. This
commit makes the dependency explicit: the nRF21540 GPIO+SPI driver
selects CONFIG_PINCTRL and throws a build error if that Kconfig option
is not set. Code executed when pin controller was disabled was removed.

Signed-off-by: Jędrzej Ciupis <[email protected]>
@NordicBuilder
Copy link
Contributor

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
desktop52_verification X
test-ci-nrfconnect-boot-fw-update X
test-fw-nrfconnect-apps X
test-fw-nrfconnect-ble X
test-fw-nrfconnect-ble_mesh X
test-fw-nrfconnect-ble_samples X
test-fw-nrfconnect-chip X
test-fw-nrfconnect-fem X
test-fw-nrfconnect-nrf-iot_cloud X
test-fw-nrfconnect-nrf-iot_libmodem-nrf X
test-fw-nrfconnect-nrf-iot_lwm2m X
test-fw-nrfconnect-nrf-iot_mosh X
test-fw-nrfconnect-nrf-iot_positioning X
test-fw-nrfconnect-nrf-iot_samples X
test-fw-nrfconnect-nrf-iot_serial_lte_modem X
test-fw-nrfconnect-nrf-iot_thingy91 X
test-fw-nrfconnect-nrf-iot_zephyr_lwm2m X
test-fw-nrfconnect-nrf_crypto X
test-fw-nrfconnect-rpc X
test-fw-nrfconnect-rs X
test-fw-nrfconnect-tfm X
test-fw-nrfconnect-thread X
test-fw-nrfconnect-zigbee X
test-sdk-audio X
test-sdk-find-my X
test-sdk-sidewalk X
test-sdk-wifi X

test-ci-nrfconnect-boot-fw-update: added because there was no .github/test-spec.yml in 'mcuboot'
test-fw-nrfconnect-chip: added because there was no .github/test-spec.yml in 'matter'
test-sdk-find-my: added because there was no .github/test-spec.yml in 'find-my'
test-sdk-sidewalk: added because there was no .github/test-spec.yml in 'sidewalk'
test-sdk-wifi: added because there was no .github/test-spec.yml in 'hostap'

Detailed information of selected test modules

Note: This message is automatically posted and updated by the CI

@de-nordic
Copy link
Contributor Author

It has been decided that the upmerge will not be updated to the latest sha, closing.

@de-nordic de-nordic closed this Dec 13, 2023
@de-nordic de-nordic deleted the upmerge-20231208 branch March 4, 2024 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nordic-krch nordic-krch Awaiting requested review from nordic-krch nordic-krch will be requested when the pull request is marked ready for review nordic-krch is a code owner

@stephen-nordic stephen-nordic Awaiting requested review from stephen-nordic stephen-nordic will be requested when the pull request is marked ready for review stephen-nordic is a code owner

@magnev magnev Awaiting requested review from magnev magnev will be requested when the pull request is marked ready for review magnev is a code owner

@Balaklaka Balaklaka Awaiting requested review from Balaklaka Balaklaka will be requested when the pull request is marked ready for review Balaklaka is a code owner

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic Damian-Nordic will be requested when the pull request is marked ready for review Damian-Nordic is a code owner

@nordic-auko nordic-auko Awaiting requested review from nordic-auko nordic-auko will be requested when the pull request is marked ready for review nordic-auko is a code owner

@oyvindronningstad oyvindronningstad Awaiting requested review from oyvindronningstad oyvindronningstad will be requested when the pull request is marked ready for review oyvindronningstad is a code owner

@trantanen trantanen Awaiting requested review from trantanen trantanen will be requested when the pull request is marked ready for review trantanen is a code owner

@tokangas tokangas Awaiting requested review from tokangas tokangas will be requested when the pull request is marked ready for review tokangas is a code owner

@carlescufi carlescufi Awaiting requested review from carlescufi carlescufi will be requested when the pull request is marked ready for review carlescufi is a code owner

@Frodevan Frodevan Awaiting requested review from Frodevan Frodevan will be requested when the pull request is marked ready for review Frodevan is a code owner

@lats1980 lats1980 Awaiting requested review from lats1980 lats1980 will be requested when the pull request is marked ready for review lats1980 is a code owner

@ankuns ankuns Awaiting requested review from ankuns ankuns will be requested when the pull request is marked ready for review ankuns is a code owner

@martintv martintv Awaiting requested review from martintv martintv will be requested when the pull request is marked ready for review martintv is a code owner

@D-Triveni D-Triveni Awaiting requested review from D-Triveni D-Triveni will be requested when the pull request is marked ready for review D-Triveni is a code owner

@bama-nordic bama-nordic Awaiting requested review from bama-nordic bama-nordic will be requested when the pull request is marked ready for review bama-nordic is a code owner

@jhirsi jhirsi Awaiting requested review from jhirsi jhirsi will be requested when the pull request is marked ready for review jhirsi is a code owner

@doki-nordic doki-nordic Awaiting requested review from doki-nordic doki-nordic will be requested when the pull request is marked ready for review doki-nordic is a code owner

Assignees
No one assigned
Labels
ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. CI-force-downstream DNM doc-required PR must not be merged without tech writer approval. manifest manifest-find-my manifest-hostap manifest-matter manifest-mcuboot manifest-memfault-firmware-sdk manifest-nrfxlib manifest-sidewalk manifest-zephyr
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@de-nordic @NordicBuilder @nordicjm @MarekPieta @aescolar @rado17 @tejlmand @tokangas @m-alperen-sener @eivindj-nordic