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

samples: ssf_client: support sysbuild and remove sdfw_update service from sample #17239

Closed

Conversation

anhmolt
Copy link
Contributor

@anhmolt anhmolt commented Sep 9, 2024

  • app+rad multi image build
  • remove call to sdfw_update service
  • Clean up sample.yaml and log by default on default serial

@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: 5

Inputs:

Sources:

sdk-nrf: PR head: 5c3e01425727bb950c45d25cb841f026d540f743

more details

sdk-nrf:

PR head: 5c3e01425727bb950c45d25cb841f026d540f743
merge base: d05aa8982166ac45a26773ff6e403109f8a38e29
target head (main): d05aa8982166ac45a26773ff6e403109f8a38e29
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 (17)
samples
│  ├── sdfw
│  │  ├── ssf_client
│  │  │  ├── CMakeLists.txt
│  │  │  ├── Kconfig
│  │  │  ├── Kconfig.sysbuild
│  │  │  ├── README.rst
│  │  │  ├── boards
│  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.overlay
│  │  │  │  │ nrf54h20dk_nrf54h20_cpurad.overlay
│  │  │  ├── prj.conf
│  │  │  ├── rad_image
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── Kconfig
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpurad.overlay
│  │  │  │  │  ├── nrf9280pdk_nrf9280_cpurad.conf
│  │  │  │  │  │ nrf9280pdk_nrf9280_cpurad.overlay
│  │  │  │  │ prj.conf
│  │  │  ├── sample.yaml
│  │  │  ├── src
│  │  │  │  │ main.c
│  │  │  ├── sysbuild.cmake
│  │  │  │ uart_logging.conf

Outputs:

Toolchain

Version: add720b6d9
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:add720b6d9_912848a074

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 40
  • ✅ Integration tests
    • ⚠️ test-secdom-samples-public
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_cloud
    • 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-nrf_crypto
    • test-fw-nrfconnect-proprietary_esb
    • 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-dfu
    • test-sdk-find-my
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-sdk-wifi

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

@anhmolt anhmolt force-pushed the sample-ssf_client-log-default branch from de72335 to a064f67 Compare September 9, 2024 12:30
@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.

@anhmolt anhmolt force-pushed the sample-ssf_client-log-default branch from a064f67 to fa53678 Compare October 8, 2024 11:26
@anhmolt anhmolt requested review from a team as code owners October 8, 2024 11:26
@nordicjm
Copy link
Contributor

nordicjm commented Oct 8, 2024

multi-image build is child/parent image, this should say sysbuild

@anhmolt anhmolt changed the title samples: ssf_client: support multi-image build and remove sdfw_update service from sample samples: ssf_client: support sysbuild and remove sdfw_update service from sample Oct 8, 2024
@anhmolt
Copy link
Contributor Author

anhmolt commented Oct 8, 2024

multi-image build is child/parent image, this should say sysbuild

Thanks! Have updated the title.

Comment on lines 12 to 16
config RADIO_IMAGE_BOARD
string "The board used for cpurad target"
depends on BUILD_ALSO_FOR_RADIO_CORE
default "nrf54h20dk/nrf54h20/cpurad" if BOARD_NRF54H20DK_NRF54H20_CPUAPP
default "nrf9280pdk/nrf9280/cpurad" if BOARD_NRF9280PDK_NRF9280_CPUAPP
Copy link
Contributor

Choose a reason for hiding this comment

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

Rework to work as the sysbuild Kconfig files do i.e. rename to *_BOARD_TARGET_CPUCLUSTER, reference SOC_* Kconfigs and only have the CPU cluster here then work out the board to use properly in cmake - see https://github.com/nrfconnect/sdk-nrf/blob/main/sysbuild/Kconfig.netcore#L15 and https://github.com/nrfconnect/sdk-nrf/blob/main/sysbuild/netcore.cmake

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. I have updated to work out the radio board target in cmake.

Enable logging by default.

Signed-off-by: Andreas Moltumyr <[email protected]>
Remove deprecated sdfw_update service request from the sample.

Signed-off-by: Andreas Moltumyr <[email protected]>
Use CONFIG_BOARD_TARGET instead of CONFIG_BOARD in the
sample log message and echo string.

Signed-off-by: Andreas Moltumyr <[email protected]>
Build additional radio image when building for application CPU
and CONFIG_SB_ALSO_FOR_RADIO_CORE is set.

Signed-off-by: Andreas Moltumyr <[email protected]>
@anhmolt anhmolt force-pushed the sample-ssf_client-log-default branch from fa53678 to 5c3e014 Compare October 29, 2024 09:01
@anhmolt anhmolt requested a review from a team as a code owner October 29, 2024 09:01
source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"

config BUILD_ALSO_FOR_RADIO_CORE
bool "Build also for the radio CPU"
Copy link
Contributor

Choose a reason for hiding this comment

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

this should have depends on for what needs it and default y

Comment on lines +35 to +36
extra_args:
SB_CONFIG_BUILD_ALSO_FOR_RADIO_CORE=y
Copy link
Contributor

Choose a reason for hiding this comment

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

and this should not be present

Comment on lines +7 to +12
string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}")
list(GET split_board_qualifiers 1 target_soc)
list(GET split_board_qualifiers 2 target_cpucluster)
set(board_target_radiocore "${BOARD}/${target_soc}/${SB_CONFIG_RADIO_BOARD_TARGET_CPUCLUSTER}")
set(target_soc)
set(target_cpucluster)
Copy link
Contributor

Choose a reason for hiding this comment

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

this goes in the if() part below

Copy link

github-actions bot commented Dec 1, 2024

This pull request has been marked as stale because it has been open (more than) 30 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this pull request will automatically be closed in 7 days. Note, that you can always re-open a closed pull request at any time.

@github-actions github-actions bot added the Stale label Dec 1, 2024
@thst-nordic thst-nordic closed this Dec 3, 2024
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. doc-required PR must not be merged without tech writer approval. Stale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants