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 2024.12.20 #19720

Open
wants to merge 104 commits into
base: main
Choose a base branch
from
Open

Upmerge 2024.12.20 #19720

wants to merge 104 commits into from

Conversation

anangl
Copy link
Contributor

@anangl anangl commented Jan 2, 2025

Pull in upmerged revisions of zephyr and mcuboot.

test_low_level: PR-1765
test_rs: PR-1483
test_fem: PR-1483
test_ble_mesh: ble_mesh_upmerge_test
test_crypto: PR-750
test_suit_dfu: PR-450
test_tfm: PR-194
test_secdom_samples_public: NCSDK-NONE_upmerge_jan2025
test_audio: PR-294

@anangl anangl requested a review from a team as a code owner January 2, 2025 07:11
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jan 2, 2025

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
dragoon d85f37138db71ea6376260fb3ed5819faa4b97ee develop/DRGN-23817_adapt_for_upmerge_20241220 N/A
find-my https://github.com/nrfconnect/sdk-find-my/commit/719d36b15db3f228b0d83c52f13b97145d971ea4 (main) https://github.com/nrfconnect/sdk-find-my/pull/260 nrfconnect/sdk-find-my#260/files
mcuboot nrfconnect/sdk-mcuboot@3a25855 (main) nrfconnect/sdk-mcuboot#393 nrfconnect/sdk-mcuboot#393/files
sidewalk nrfconnect/sdk-sidewalk@f274ce8 nrfconnect/sdk-sidewalk#673 nrfconnect/sdk-sidewalk#673/files
suit-processor nrfconnect/suit-processor@a499bca nrfconnect/suit-processor@a1a9ef7 (main) nrfconnect/[email protected]
zephyr nrfconnect/sdk-zephyr@7cbe361 (main) nrfconnect/sdk-zephyr#2411 nrfconnect/sdk-zephyr#2411/files

DNM label due to: 4 projects with PR revision and 1 unreachable repo

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

@gmarull
Copy link
Member

gmarull commented Jan 2, 2025

#19200 should be merged first (other repos need the same update, will open PRs)

@gmarull
Copy link
Member

gmarull commented Jan 2, 2025

3efae06 should be added here (I assume upstream BICR tooling is part of this upmerge)

@anangl anangl requested review from a team as code owners January 3, 2025 12:35
@github-actions github-actions bot added the doc-required PR must not be merged without tech writer approval. label Jan 3, 2025
@anangl anangl force-pushed the upmerge_20241220 branch 2 times, most recently from e829967 to 00df919 Compare January 3, 2025 16:43
@anangl anangl requested review from a team as code owners January 3, 2025 16:50
@anangl
Copy link
Contributor Author

anangl commented Jan 3, 2025

3efae06 should be added here (I assume upstream BICR tooling is part of this upmerge)

done

@thst-nordic thst-nordic self-requested a review January 6, 2025 13:27
@anangl anangl requested a review from a team as a code owner January 7, 2025 12:43
@anangl anangl force-pushed the upmerge_20241220 branch 3 times, most recently from f315d52 to 22726df Compare January 10, 2025 08:23
@anangl anangl requested review from a team as code owners January 10, 2025 08:23
@anangl anangl requested review from sachinthegreen, krish2718 and a team as code owners January 10, 2025 09:00
frkv and others added 27 commits February 4, 2025 20:19
-QEMU target is not setting SOC_FAMILY_NORDIC_NRF so it doesn't
 build with PSA crypto enabled. Disabling qemu_cortex_m3 for:
 -light_ctrl
 -light_hue
 -sensor_subsys
 -silvair_enocean_model

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Application `applications.connectivity_bridge` reports FLASH overflow.

Refers: NCSDK-31534

Signed-off-by: Katarzyna Giądła <[email protected]>
The dfu_target uses suit_dfu library and does not use SSF services
directly.

Ref: NCSDK-31359

Signed-off-by: Tomasz Chyrowicz <[email protected]>
Since envelope info library includes directly the platform error header,
it is far easier to link them in CMake than
remember to manually link platform error with each file that uses
envelope info interface.

Ref: NCSDK-31359

Signed-off-by: Tomasz Chyrowicz <[email protected]>
The test uses SSF interface mock instead, so disable the SSF to avoid
two implementations of the same interface.

Ref: NCSDK-31359

Signed-off-by: Tomasz Chyrowicz <[email protected]>
Those fail to build due to RAM overflows.

Signed-off-by: Andrzej Głąbek <[email protected]>
sntp_query()'s time parameter was renamed to ts so corresponding change
needed to cmock usage.

Signed-off-by: Tommi Rantanen <[email protected]>
- Set missing configs to get tests running
- Changed define for broadcast_code as per migration guide
- OCT-3172
Fixes an issue with this test wrongly using 0 as the area size

Signed-off-by: Jamie McCrae <[email protected]>
Output uses logging, which has no guarantee of even being enabled
or supported

Signed-off-by: Jamie McCrae <[email protected]>
- `native_sim/native` needs to be used now instead of `native_sim`
- add entries for failing samples and tests that are to be handled
  after the upmerge:
  * sample.mcumgr.smp_svr.ram_load.*
  * nrf_modem_dect_phy_pcc_event
  * secure_storage.psa.its.secure_storage.*
  * sample.net.prometheus
- remove `native_posix`

Signed-off-by: Maciej Perkowski <[email protected]>
Signed-off-by: Andrzej Głąbek <[email protected]>
So far when building for nRF54L15 static DPPI channels were assigned.
After adding nRF54L15 support in the DPPI driver this code is unused
for nRF54L15 and the common DPPI allocator used hardcoded DPPIC
instance. This commit parameterizes the DDPIC instance number depending
on the SoC and enables the coresponding instances in the ESB samples'
configurations. ESB uses hardcoded instance number per SoC.

TODO: Allow selection of the DPPIC instance in one place e.g. Kconfig
based on the DTS.

Signed-off-by: Michał Grochala <[email protected]>
- Change posix names to zsock.
- Remove CONFIG_x_NRF_HW_ASYNC usage.
- Correct size for the external flash.

Signed-off-by: Markus Lassila <[email protected]>
Function has been deprecated in upstream zephyr, so remove
from here.

Signed-off-by: Sean Madigan <[email protected]>
Let HOSTAP_CRYPTO_ALT_LEGACY_PSA select MBEDTLS_MD5_C so that
md5 related calls are available when crypto_alt is used.

Signed-off-by: Ravi Dondaputi <[email protected]>
In scan_only build we need to override the sysbuild config option
as well. By default it gets set to SB_CONFIG_WIFI_NRF70_SYSTEM_MODE
which enables supplicant. Overriding this with
SB_CONFIG_WIFI_NRF70_SCAN_ONLY fixes this.

Signed-off-by: Ravi Dondaputi <[email protected]>
The ZMS implementation of the ITS store module is not supported when
partition manager is used because the DT chosen
`secure_storage_its_partition` cannot be used.
This would require using a different, partition manager-specific
configuration.
As partition manager will be replaced this combination is just not
supported.

Signed-off-by: Tomi Fontanilles <[email protected]>
We cannot render/link Doxygen groups that belong to another project like
Zephyr, see nrfconnect#19341 for
progress on that.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
Add Zephyr tests due to overflow issues.

Refers:
NCSDK-31589
NCSDK-31590
NCSDK-31591

Signed-off-by: Katarzyna Giądła <[email protected]>
BLE logging size requirements have increased a lot.
We need to reduce logging to fit the application.

Signed-off-by: Maximilian Deubel <[email protected]>
Switched from speed to size optimization for nRF54H20 DK target in
debug configurations to reduce memory footprint.

Jira: NCSDK-31374

Signed-off-by: Mateusz Kapala <[email protected]>
Switched from speed to size optimizations for nRF54L15 DK (nRF54L05
emulated SoC) and enabled LTO in debug and release configurations
to reduce memory footprint.

Jira: NCSDK-31374

Signed-off-by: Mateusz Kapala <[email protected]>
Remove reference of z_impl_sys_rand_get().

Signed-off-by: Eivind Jølsgard <[email protected]>
Updates required by changes in zephyr upstream for the BT HCI driver.

Signed-off-by: Tommi Rantanen <[email protected]>
Update pm policy event usage after API was changed from
using relative time in cycles to absolute time in ticks.

Signed-off-by: Knut Eldhuset <[email protected]>
This test is not really useful in NCS context (checking if the nRF
Wi-Fi driver can be built successfully is done by other tests and
samples), and it requires the hal_atmel module to be pulled in
(because the WINC1500 driver requires two header files that are
located in that module). And the module weights ~87 MB, so it's
not reasonable to pull it in just for this one test.

Signed-off-by: Andrzej Głąbek <[email protected]>
Fixes an issue with stream writer by providing the size of the
partition

Signed-off-by: Jamie McCrae <[email protected]>
Change posix names to zsock in nrf_cloud lib.

Signed-off-by: Maximilian Deubel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.