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

suit: General fixup #20064

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

suit: General fixup #20064

wants to merge 2 commits into from

Conversation

nordicjm
Copy link
Contributor

@nordicjm nordicjm commented Jan 24, 2025

Fixes various styling issues with Kconfig files and changes Kconfig
option names that duplicate information which is already known
which would lead to more unselectable Kconfig options in future for
additional SoCs, lessening the complexity and maintenance burden.
Also fixes an issue that was completely hidden whereby an existing
Zephyr Kconfig was re-defined, completely obscuring the fact that
the original Zephyr Kconfig was removed in 4.0 and had been doing
nothing since the upmerge to that version of Zephyr

@nordicjm nordicjm requested review from a team as code owners January 24, 2025 10:03
@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 Jan 24, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jan 24, 2025

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: ea6ee47defa0df88931735d65e69f1fbf9676dde

more details

sdk-nrf:

PR head: ea6ee47defa0df88931735d65e69f1fbf9676dde
merge base: ef417cb359449e3c264bbbdb1c7d768d3f98227a
target head (main): ef417cb359449e3c264bbbdb1c7d768d3f98227a
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 (32)
subsys
│  ├── suit
│  │  ├── cache
│  │  │  │ Kconfig
│  │  ├── mci
│  │  │  ├── CMakeLists.txt
│  │  │  │ Kconfig
│  │  ├── memptr_storage
│  │  │  │ Kconfig
│  │  ├── platform
│  │  │  │ Kconfig
│  │  ├── storage
│  │  │  ├── CMakeLists.txt
│  │  │  │ Kconfig
│  │  ├── stream
│  │  │  │ Kconfig
│  │  ├── validator
│  │  │  ├── CMakeLists.txt
│  │  │  │ Kconfig
tests
│  ├── subsys
│  │  ├── suit
│  │  │  ├── cache_pool_digest
│  │  │  │  │ CMakeLists.txt
│  │  │  ├── check_content
│  │  │  │  │ Kconfig
│  │  │  ├── check_image_match
│  │  │  │  │ Kconfig
│  │  │  ├── common
│  │  │  │  │ CMakeLists.txt
│  │  │  ├── component_compatibility_check
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  │ prj.conf
│  │  │  ├── copy
│  │  │  │  │ Kconfig
│  │  │  ├── digest_sink
│  │  │  │  │ CMakeLists.txt
│  │  │  ├── envelope_decoder
│  │  │  │  │ Kconfig
│  │  │  ├── fetch_integrated_payload_flash
│  │  │  │  │ Kconfig
│  │  │  ├── flash_sink
│  │  │  │  │ CMakeLists.txt
│  │  │  ├── manifest_variables
│  │  │  │  │ Kconfig
│  │  │  ├── orchestrator
│  │  │  │  ├── orchestrator_app
│  │  │  │  │  │ CMakeLists.txt
│  │  │  │  ├── orchestrator_sdfw
│  │  │  │  │  │ Kconfig
│  │  │  │  ├── orchestrator_sdfw_nrf54h20
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  │ prj.conf
│  │  │  ├── storage
│  │  │  │  │ Kconfig
│  │  │  ├── storage_nrf54h20
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  │ prj.conf
│  │  │  ├── tests
│  │  │  │  ├── Kconfig
│  │  │  │  ├── sdfw
│  │  │  │  │  │ Kconfig
│  │  │  ├── write
│  │  │  │  │ Kconfig

Outputs:

Toolchain

Version: 342151af73
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:342151af73_912848a074

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 117
  • ✅ Integration tests
    • ✅ test-sdk-dfu
    • ⚠️ test-sdk-dfu
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-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-low-level
    • test-sdk-audio
    • test-sdk-find-my
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-sdk-wifi
    • test-secdom-samples-public

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.

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

@nordicjm nordicjm force-pushed the PR20024 branch 2 times, most recently from 2fe2c7e to af92dee Compare January 24, 2025 11:22
Fixes various styling issues with Kconfig files and changes Kconfig
option names that duplicate information which is already known
which would lead to more unselectable Kconfig options in future for
additional SoCs, lessening the complexity and maintenance burden.
Also fixes an issue that was completely hidden whereby an existing
Zephyr Kconfig was re-defined, completely obscuring the fact that
the original Zephyr Kconfig was removed in 4.0 and had been doing
nothing since the upmerge to that version of Zephyr

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Updates to use new Kconfig symbol names, and enables usage of the
test Kconfig only in tests to prevent accidental selection by
users where it should not be able to be selected

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@maciejpietras maciejpietras requested review from tomchy, robertstypa and a team January 27, 2025 13:42
zephyr_library_sources_ifdef(CONFIG_SUIT_VALIDATOR_IMPL_NRF54H20_SDFW src/suit_validator_nrf54h20.c)

if(CONFIG_SUIT_VALIDATOR_IMPL_SDFW)
zephyr_library_sources_ifdef(src/suit_validator_${CONFIG_SOC}.c)
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing Kconfig symbol - or - this should be zephyr_library_sources?

@@ -1,5 +1,5 @@
#
# Copyright (c) 2023 Nordic Semiconductor ASA
# Copyright (c) 2023-2025 Nordic Semiconductor ASA
Copy link
Contributor

Choose a reason for hiding this comment

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

To my knowledge - we do not use two dates/years in NCS.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

./subsys/bluetooth/mesh/Kconfig.models:# Copyright (c) 2019 - 2020 Nordic Semiconductor ASA
./subsys/bluetooth/mesh/time_util.h: * Copyright (c) 2020-2023 Nordic Semiconductor ASA
./subsys/caf/events/ble_common_event.c: * Copyright (c) 2018-2021 Nordic Semiconductor ASA
./subsys/caf/events/ble_smp_event.c: * Copyright (c) 2018-2021 Nordic Semiconductor ASA
./subsys/caf/events/button_event.c: * Copyright (c) 2018-2021 Nordic Semiconductor ASA
./subsys/caf/events/click_event.c: * Copyright (c) 2019-2021 Nordic Semiconductor ASA
./subsys/caf/events/led_event.c: * Copyright (c) 2018-2021 Nordic Semiconductor ASA
./subsys/caf/events/module_state_event.c: * Copyright (c) 2018-2021 Nordic Semiconductor ASA
./subsys/caf/events/power_event.c: * Copyright (c) 2018-2021 Nordic Semiconductor ASA
./subsys/caf/modules/Kconfig.ble_smp:# Copyright (c) 2020-2021 Nordic Semiconductor
./subsys/caf/modules/Kconfig.buttons:# Copyright (c) 2019-2021 Nordic Semiconductor ASA
./subsys/caf/modules/Kconfig.click_detector:# Copyright (c) 2019-2021 Nordic Semiconductor ASA
./subsys/caf/modules/Kconfig.leds:# Copyright (c) 2019-2021 Nordic Semiconductor ASA
./subsys/caf/modules/ble_adv.c: * Copyright (c) 2018-2021 Nordic Semiconductor ASA

# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

config SUPPORT_SUIT_STORAGE_LAYOUT_TEST
Copy link
Contributor

Choose a reason for hiding this comment

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

I have a mixed feelings about putting this file inside sdfw directory, but I do not have a better idea to propose.

Interestingly, this file configures storage symbol, but does not MPI nor validator. This is not necessary today, but it justifies the generic naming scheme of this file.

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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants