Skip to content

Conversation

@JarmouniA
Copy link
Contributor

@JarmouniA JarmouniA commented Oct 18, 2024

Replace some OVERLAY_CONFIG instances that were missed in #79504.

Also, fix incorrect use of EXTRA_CONF_FILE, instead of CONF_FILE, when the config file actually contains an alternative config & not just additional/modified options.

@JarmouniA JarmouniA added area: Samples Samples area: Tests Issues related to a particular existing or missing test labels Oct 18, 2024
Copy link
Contributor

@thedjnK thedjnK left a comment

Choose a reason for hiding this comment

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

I really do not see the value in any of these renames

@JarmouniA JarmouniA force-pushed the fix_overlay_config_use branch 2 times, most recently from fe63339 to 922a83e Compare October 18, 2024 22:27
@JarmouniA JarmouniA changed the title sample/testcase.yaml: add 'overlay-' prefix to overlay config files sample/testcase.yaml: replace deprecated OVERLAY_CONFIG with EXTRA_CONF_FILE Oct 18, 2024
thedjnK
thedjnK previously approved these changes Oct 19, 2024
butok
butok previously approved these changes Oct 22, 2024
kartben
kartben previously approved these changes Oct 22, 2024
Move stm32_blk.conf ouside of 'boards' as this folder is meant to
contain only board-specific devicetree overlays and Kconfig fragments.

Signed-off-by: Abderrahmane Jarmouni <[email protected]>
…_FILE

Replace some OVERLAY_CONFIG that were missed in a pervious PR.

Signed-off-by: Abderrahmane Jarmouni <[email protected]>
Replace OVERLAY_CONFIG with CONF_FILE since the file in question
contains an alternative configuration to the one in prj.conf
as clearly stated in the sample doc
'If you use poll you should also use `prj_poll.conf` instead of
`prj.conf`.'

Signed-off-by: Abderrahmane Jarmouni <[email protected]>
…_FILE

Replace some OVERLAY_CONFIG that were missed in a pervious PR.

Signed-off-by: Abderrahmane Jarmouni <[email protected]>
Replace OVERLAY_CONFIG with CONF_FILE since no-device-pm.conf
contains an alternative configuration to the one in prj.conf

Signed-off-by: Abderrahmane Jarmouni <[email protected]>
@JarmouniA JarmouniA dismissed stale reviews from kartben, butok, and thedjnK via b6383dd October 22, 2024 19:13
@JarmouniA JarmouniA force-pushed the fix_overlay_config_use branch from 922a83e to b6383dd Compare October 22, 2024 19:13
@JarmouniA
Copy link
Contributor Author

Rebased to resolve merge conflicts

@carlescufi carlescufi merged commit d32c58b into zephyrproject-rtos:main Oct 24, 2024
25 checks passed
@JarmouniA JarmouniA deleted the fix_overlay_config_use branch October 24, 2024 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area: Samples Samples area: Tests Issues related to a particular existing or missing test

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants