Skip to content

Conversation

nika-nordic
Copy link
Contributor

Updated sdk-zephyr aligns existing Kconfigs to nRF54L15, while updated TF-M excludes nRF54L15 from existing APPROTECT-related runtime code which is not yet aligned.

This is a backport of #18370

@nika-nordic nika-nordic added this to the 2.8.0 milestone Nov 4, 2024
@nika-nordic nika-nordic requested review from a team as code owners November 4, 2024 06:46
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Nov 4, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Nov 4, 2024

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

Name Old Revision New Revision Diff
trusted-firmware-m nrfconnect/[email protected] nrfconnect/sdk-trusted-firmware-m@ac72485 (v2.1.1-ncs1-branch) nrfconnect/[email protected]
zephyr nrfconnect/sdk-zephyr@bc59fe3 nrfconnect/sdk-zephyr@0f0e5ad (v3.7.99-ncs1-branch) nrfconnect/[email protected]

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Nov 4, 2024

CI Information

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

Inputs:

Sources:

trusted-firmware-m: PR head: ac72485fdd643d636808484fcb34dab442dd584d
sdk-nrf: PR head: 9b29d31fefd7cfe491f832c626056711a85597f2
zephyr: PR head: 0f0e5ad7da0d1e423a1991485e9dfc6fef3757fe

more details

trusted-firmware-m:

PR head: ac72485fdd643d636808484fcb34dab442dd584d
merge base: 8c7fae3936da02b7db4f5c8aba174b252a2b326e
Diff

sdk-nrf:

PR head: 9b29d31fefd7cfe491f832c626056711a85597f2
merge base: 21f851fa7d3c91f0e45c67f741bbf9e8efea9fc9
target head (v2.8-branch): 21f851fa7d3c91f0e45c67f741bbf9e8efea9fc9
Diff

zephyr:

PR head: 0f0e5ad7da0d1e423a1991485e9dfc6fef3757fe
merge base: bc59fe3cf65c054b13305aa977ecddddf7cf42e4
Diff

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 (5)
modules
│  ├── tee
│  │  ├── tf-m
│  │  │  ├── trusted-firmware-m
│  │  │  │  ├── platform
│  │  │  │  │  ├── ext
│  │  │  │  │  │  ├── target
│  │  │  │  │  │  │  ├── nordic_nrf
│  │  │  │  │  │  │  │  ├── common
│  │  │  │  │  │  │  │  │  ├── core
│  │  │  │  │  │  │  │  │  │  │ target_cfg.c
│  ├── trusted-firmware-m
│  │  ├── tfm_boards
│  │  │  │ external_core.cmake
west.yml
zephyr
│  ├── modules
│  │  ├── hal_nordic
│  │  │  ├── nrfx
│  │  │  │  │ CMakeLists.txt
│  ├── soc
│  │  ├── nordic
│  │  │  │ Kconfig

Outputs:

Toolchain

Version:
Build docker image:

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

  • ◻️ Toolchain
  • ◻️ Build twister
  • ◻️ Integration tests
    • ◻️ test-sdk-audio
    • ◻️ test-fw-nrfconnect-chip
    • ◻️ test-fw-nrfconnect-nfc
    • ◻️ test-fw-nrfconnect-nrf-iot_cloud
    • ◻️ test-fw-nrfconnect-nrf_crypto
    • ◻️ test-fw-nrfconnect-rs
    • ◻️ test-fw-nrfconnect-fem
    • ◻️ test-fw-nrfconnect-tfm
    • ◻️ test-fw-nrfconnect-thread
    • ◻️ test-sdk-find-my
    • ◻️ test-sdk-sidewalk
    • ◻️ test-low-level
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-boot
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_nrf_provisioning
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-zigbee
    • test-sdk-dfu
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-wifi

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.

Copy link
Contributor

@rlubos rlubos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update SHAs

west.yml Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ac72485fdd643d636808484fcb34dab442dd584d

west.yml Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0f0e5ad7da0d1e423a1991485e9dfc6fef3757fe

MarkusLassila and others added 2 commits November 4, 2024 10:09
Allow nRF54L15 approtect settings to be set through TF-M.

Signed-off-by: Markus Lassila <[email protected]>
Updated sdk-zephyr aligns existing Kconfigs to nRF54L15,
while updated TF-M excludes nRF54L15 from existing
APPROTECT-related runtime code which is not yet aligned.

Signed-off-by: Nikodem Kastelik <[email protected]>
@nika-nordic nika-nordic force-pushed the fix_nrf54l_kconfig_approtect_sdknrf_backport branch from d880493 to 9b29d31 Compare November 4, 2024 09:11
@nika-nordic
Copy link
Contributor Author

@rlubos updated SHA as suggested

@NordicBuilder NordicBuilder removed the DNM label Nov 4, 2024
@rlubos rlubos merged commit 8154425 into nrfconnect:v2.8-branch Nov 4, 2024
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest manifest-trusted-firmware-m manifest-zephyr

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants