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

Sysbuild fix approtect #20609

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

Sysbuild fix approtect #20609

wants to merge 2 commits into from
+33 −10

Conversation

MarkusLassila
Copy link
Contributor

  • Setting SB_CONFIG_APPROTECT_* values resulted in error if SB_CONFIG_SECURE_APPROTECT_* value was not set.
  • Add nRF54LX suppport for SB_CONFIG_APPROTECT_* and SB_CONFIG_SECURE_APPROTECT_*.

Documentation update for ap_protect.rst will be done on a follow-up PR.

@MarkusLassila MarkusLassila requested a review from a team as a code owner February 26, 2025 08:22
@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Feb 26, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 26, 2025 •
edited
Loading

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: b5f23a477a23394747614cbd315d66c72c21250b

more details

sdk-nrf:

PR head: b5f23a477a23394747614cbd315d66c72c21250b
merge base: c2e0a5880f68268b0974e7af56a65c40ee7de635
target head (main): c2e0a5880f68268b0974e7af56a65c40ee7de635
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 (2) 
sysbuild
│  ├── CMakeLists.txt
│  │ Kconfig.approtect

Outputs:

Toolchain

Version: aedb4c0245
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:aedb4c0245_bece0367df

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
  • ❌ Integration tests
    • ✅ test-sdk-audio
    • ✅ desktop52_verification
    • ✅ test-fw-nrfconnect-boot
    • ✅ test-fw-nrfconnect-apps
    • ❌ test_ble_nrf_config
    • ✅ test-fw-nrfconnect-ble_mesh
    • ✅ test-fw-nrfconnect-ble_samples
    • ✅ test-fw-nrfconnect-chip
    • ✅ test-fw-nrfconnect-nfc
    • ✅ test-fw-nrfconnect-nrf-iot_cloud
    • ❌ test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • ✅ test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • ✅ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • ✅ test-fw-nrfconnect-nrf-iot_samples
    • ✅ test-fw-nrfconnect-nrf-iot_lwm2m
    • ✅ doc-internal
    • ✅ test-fw-nrfconnect-nrf-iot_thingy91
    • ✅ test-fw-nrfconnect-nrf_crypto
    • ✅ test-fw-nrfconnect-proprietary_esb
    • ✅ test-fw-nrfconnect-rpc
    • ✅ test-fw-nrfconnect-rs
    • ✅ test-fw-nrfconnect-fem
    • ✅ test-fw-nrfconnect-tfm
    • ✅ test-fw-nrfconnect-thread
    • ✅ test-fw-nrfconnect-zigbee
    • ✅ test-sdk-find-my
    • ✅ test-fw-nrfconnect-nrf-iot_mosh
    • ✅ test-fw-nrfconnect-nrf-iot_positioning
    • ✅ test-sdk-sidewalk
    • ✅ test-sdk-wifi
    • ✅ test-low-level
    • ✅ test-sdk-pmic-samples
    • ✅ test-sdk-mcuboot
    • ✅ test-sdk-dfu
    • ✅ test-fw-nrfconnect-ps
    • ✅ test-secdom-samples-public

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

@MarkusLassila MarkusLassila removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Feb 26, 2025
nordicjm
nordicjm reviewed Feb 26, 2025
View reviewed changes
sysbuild/CMakeLists.txt Outdated
Comment on lines 598 to 600
if(secure_approtect AND SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE AND ${image} IN_LIST network_images)
# Network core image
set_config_bool(${image} ${normal_approtect} y)
Copy link
Contributor

Choose a reason for hiding this comment

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

keep existing style that checks the SB_CONFIG_*'s

@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Feb 26, 2025
@MarkusLassila
sysbuild: Fix setting only SB_CONFIG_APPROTECT_*
1f6a83a 
Setting SB_CONFIG_APPROTECT_* values resulted in error
if SB_CONFIG_SECURE_APPROTECT_* value was not set.

Signed-off-by: Markus Lassila <[email protected]>
@MarkusLassila
sysbuild: Add nRF54LX support for SB_CONFIG_APPROTECT
b5f23a4 
Add nRF54LX suppport for SB_CONFIG_APPROTECT_* and
SB_CONFIG_SECURE_APPROTECT_*.

Signed-off-by: Markus Lassila <[email protected]>
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nordicjm nordicjm Awaiting requested review from nordicjm

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MarkusLassila @NordicBuilder @nordicjm