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

applications: nrf_desktop: Integrate APPLICATION_CONFIG_DIR for sysbuild #15857

Merged
merged 2 commits into from
Jun 15, 2024
Merged

applications: nrf_desktop: Integrate APPLICATION_CONFIG_DIR for sysbuild #15857

merged 2 commits into from
Jun 15, 2024

Conversation

mkapala-nordic
Copy link
Contributor

@mkapala-nordic mkapala-nordic commented Jun 10, 2024 •
edited by kapi-no
Loading 

Change integrates APPLICATION_CONFIG_DIR for sysbuild. Change also fixes
a few configuration issues observed while testing locally.

Jira: NCSDK-24857
Jira: NCSDK-27858
Jira: NCSDK-27568

and

applications: nrf_desktop: Remove bootloader-related ops from app confs

After migration to sysbuild, now bootloader-specific Kconfig options
are driven at the sysbuild level, not the main application.
Remove unecessary options that were moved to proper sysbuild*.conf
files.

Jira: NCSDK-27890

Depends on: #15530

Review only last two commits.

@mkapala-nordic mkapala-nordic added this to the 2.7.0 milestone Jun 10, 2024
@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 Jun 10, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jun 10, 2024 •
edited
Loading

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

Name Old Revision New Revision Diff
zephyr nrfconnect/sdk-zephyr@b42e02d nrfconnect/sdk-zephyr#1746 nrfconnect/sdk-zephyr#1746/files

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

@mkapala-nordic mkapala-nordic requested a review from grho June 10, 2024 12:43
@mkapala-nordic mkapala-nordic force-pushed the nrf-desktop/sysbuild-appdirconf-align branch from fd6c463 to 1ecd9f1 Compare June 11, 2024 08:15
MarekPieta
MarekPieta approved these changes Jun 11, 2024
View reviewed changes
Copy link
Contributor

@MarekPieta MarekPieta left a comment

Choose a reason for hiding this comment

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

nRF Desktop changes looks good

@shanthanordic
Copy link

Looks like big change after RC-1 @pdunaj @kapi-no Can I push it out of NCs 2.7.0 unless absolutely needed

@shanthanordic shanthanordic removed this from the 2.7.0 milestone Jun 12, 2024
@kapi-no
Copy link
Contributor

kapi-no commented Jun 12, 2024

Looks like big change after RC-1 @pdunaj @kapi-no Can I push it out of NCs 2.7.0 unless absolutely needed

If we want to maintain the production quality of the nRF Desktop app, we need this change that is blocked on the @tejlmand PR (dependency indicated in the PR description). Alternatively, we can lower the nRF Desktop quality from production to experimental following the VS code approach. However, going back to the experimental quality for NCS 2.7.0 needs wider discussion from relevant stakeholders.

On a separate note, we had a different arrangement with @carlescufi and @tejlmand, as this change was supposed to be part of NCS 2.7.0.

@kapi-no kapi-no added this to the 2.7.0 milestone Jun 12, 2024
@mkapala-nordic mkapala-nordic force-pushed the nrf-desktop/sysbuild-appdirconf-align branch from 66b5a87 to 76bdfe9 Compare June 12, 2024 13:15
@mkapala-nordic mkapala-nordic force-pushed the nrf-desktop/sysbuild-appdirconf-align branch from 76bdfe9 to 5cc0b48 Compare June 13, 2024 10:22
@mkapala-nordic
Copy link
Contributor Author

Rebased only

@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.

@mkapala-nordic mkapala-nordic mentioned this pull request Jun 13, 2024
Merged
@mkapala-nordic mkapala-nordic added the bugfix Fixes a known bug label Jun 14, 2024
@tejlmand tejlmand mentioned this pull request Jun 14, 2024
Merged
@mkapala-nordic mkapala-nordic force-pushed the nrf-desktop/sysbuild-appdirconf-align branch from 5cc0b48 to 987b1a2 Compare June 14, 2024 10:34
@mkapala-nordic
Copy link
Contributor Author

Rebased

@mkapala-nordic mkapala-nordic force-pushed the nrf-desktop/sysbuild-appdirconf-align branch from 987b1a2 to beba878 Compare June 14, 2024 13:11
@mkapala-nordic
Copy link
Contributor Author

Removed CONFIG_BOOT_DIRECT_XIP=y from MCUboot configs as it is propagated from sysbuild (nrf/sysbuild/CMakeLists.txt:L228).

MarekPieta and others added 2 commits June 15, 2024 14:08
@MarekPieta @mkapala-nordic @anangl
applications: nrf_desktop: Integrate APPLICATION_CONFIG_DIR for sysbuild
9aa811f 
Change integrates APPLICATION_CONFIG_DIR for sysbuild. Change also fixes
a few configuration issues observed while testing locally.

Jira: NCSDK-24857
Jira: NCSDK-27858
Jira: NCSDK-27568

Co-authored-by: Mateusz Kapala <[email protected]>
Signed-off-by: Marek Pieta <[email protected]>
Signed-off-by: Mateusz Kapala <[email protected]>
@mkapala-nordic @anangl
applications: nrf_desktop: Remove bootloader-related ops from app confs
1eb4b40 
After migration to sysbuild, now bootloader-specific Kconfig options
are driven at the sysbuild level, not the main application.
Remove unecessary options that were moved to proper sysbuild*.conf
files.

Jira: NCSDK-27890

Signed-off-by: Mateusz Kapala <[email protected]>
@anangl anangl force-pushed the nrf-desktop/sysbuild-appdirconf-align branch from beba878 to 1eb4b40 Compare June 15, 2024 12:10
@github-actions github-actions bot removed the manifest label Jun 15, 2024
@anangl
Copy link
Contributor

anangl commented Jun 15, 2024

Rebased after #15530 got merged.

@anangl anangl marked this pull request as ready for review June 15, 2024 12:11
@NordicBuilder
Copy link
Contributor

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
desktop52_verification X

Detailed information of selected test modules

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

@shanthanordic shanthanordic self-requested a review June 15, 2024 12:30
kapi-no
kapi-no approved these changes Jun 15, 2024
View reviewed changes
Copy link
Contributor

@kapi-no kapi-no left a comment

Choose a reason for hiding this comment

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

Approving it due to imminent RC2.

@kapi-no kapi-no removed DNM changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Jun 15, 2024
@anangl anangl merged commit b84bd0f into nrfconnect:main Jun 15, 2024
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zycz zycz zycz approved these changes

@kapi-no kapi-no kapi-no approved these changes

@alstrzebonski alstrzebonski Awaiting requested review from alstrzebonski

@grho grho Awaiting requested review from grho

@MarekPieta MarekPieta Awaiting requested review from MarekPieta

@tejlmand tejlmand Awaiting requested review from tejlmand

@shanthanordic shanthanordic Awaiting requested review from shanthanordic

Assignees
No one assigned
Labels
bugfix Fixes a known bug manifest-zephyr
Projects
None yet
Milestone
2.7.0
Development

Successfully merging this pull request may close these issues.
8 participants
@mkapala-nordic @NordicBuilder @shanthanordic @kapi-no @anangl @tejlmand @MarekPieta @zycz