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

Do Not Review: Upmerge TF-M v2.1.0 Mbed TLS v3.6.0 (only for testing) #17229

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

Conversation

frkv
Copy link
Contributor

@frkv frkv commented Sep 9, 2024

Current state: Do not merge, Do not review

This pull request adds support for TF-M 2.1.0 and Mbed TLS 3.6.0.

Missing:

  • Correct manifest checkout for related repositories (TF-M, nrfxlib, mcuboot, tf-m-tests, oberon-psa-core and Mbed TLS)
  • Removal of some WIP commits
  • Full run of CI once the aforementioned

The Do not Review statement will be removed once related repositories are synchronized)

@frkv frkv added the DNM label Sep 9, 2024
@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Sep 9, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Sep 9, 2024

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 25

Inputs:

Sources:

more details

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (0)

Outputs:

Toolchain

Version:
Build docker image:

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain
  • ◻️ Build twister
  • ◻️ Integration tests

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

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

frkv and others added 27 commits September 27, 2024 12:20
-Adding CONFIG_OBERON_BACKEND and CONFIG_CC3XX_BACKEND as a
 criteria for adding legacy Mbed TLS files like rsa.c etc..

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
net_buf tests were moved and now have a different test signature.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
-Removed filtering of SOC_FAMILY_NORDIC_NRF for the following
 configurations required to run native_posix test:
 - PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
 - PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT
 - PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
 - PSA_WANT_ECC_TWISTED_EDWARDS_255

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
z_device_is_ready() was removed, and conditionally compiled
device_get_dt_nodelabels has to be excluded from cmock generation.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Removed cpuflpr support and its partition since it is not used in
Matter. This saves the MRAM memory for the application code.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Removed DTS nodes associated with the cpuflpr target as they refer to
the cpuflpr_code_partition label from the cpuapp_rx_partitions node. The
label has been removed in this file due to the modification of the
cpuapp_rx_partitions node. The cpuflpr_vpr and cpuapp_cpuflpr_ipc DTS
nodes are removed to prevent build failures.

Ref: NCSDK-29186

Signed-off-by: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
-This sample is using mbedtls_sha which was not resolved.
 By enabling CONFIG_MBEDTLS_LEGACY_C we allow that this for now

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
New config for coap_client was introduced upstream so need to define it
in the test.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Fix the compile warnings in NCS bluetooth samples.

Signed-off-by: Lang Xie <lang.xie@nordicsemi.no>
These are now local (nrf docset).

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
-For some reason this was quoted (which is not right). Changing
 ${oberon_psa_core} to oberon_psa_core (which is the actual target)

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
Config option for WPA_SUPPLICANT module has been modified. Use the
updated config option instead of `WPA_SUPP`.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
The nrfx_spim blocking and non_blocking samples which are in
hal_nordic are blocking upmerge, and can not be fixed as part of
upmerge. Therefore quarantine them. They will be fixed upstream
and included in next upmerge.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
This is done to unblock the upmerge, as psa signature verification
stopped working, as well as the imported volatile key_id has changed.

Will be reverted when PSA on native posix works correctly again.

Signed-off-by: Artur Hadasz <artur.hadasz@nordicsemi.no>
Fix the compile warning in samples, i.e., initialization discards
'const' qualifier from pointer target type.

Signed-off-by: Lang Xie <lang.xie@nordicsemi.no>
Disabled cpuflpr in the Openthread CLI sample DTS overlay file.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
- Changelog pass done
- Made changes to BCT and added
  bt_bap_unicast_server_register
- BIS bitfield change

Signed-off-by: Kristoffer Rist Skøien <kristoffer.skoien@nordicsemi.no>
fixup! crypto: Adding threading support for PSA core

-Needs to be pointer to function not functions

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
Static RAM usage is exceeding the `RAM` region at build time. Decrease
the number of RX buffers to fix this.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Add sysbuild conf to override the default setting for `WIFI_NRF70`.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
The common header file is now renamed with the module prefix.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Adds support for devices that support flatten and not (or as well)
as erase

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
When sysbuild Wi-Fi needs to be enabled explicitly to avoid build
issues.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
fixup! crypto: Adding threading support for PSA core

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
-Fixes issues booting TF-M

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
-Fixes issues on nRF54L15 devices (uses CRACEN)

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
@frkv frkv force-pushed the upmerge-TF-M-2.1-mbedtls-3.6 branch from e06e583 to 2425f3f Compare September 27, 2024 11:45
-Setting the flag was missing

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
-Added regression trying to fix tfm_hello_Word. This commmit fixes it

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
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.