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

cmake: Look for revision specific overlays also in <app>/boards/ #31617

Conversation

anangl
Copy link
Member

@anangl anangl commented Jan 26, 2021

This is a follow-up to commit 77ecd68.

Add missing check that looks for a revision specific overlay located
in the <app>/boards/ directory (before checking the main application
directory, similarly to how normal overlays are handled).

Signed-off-by: Andrzej Głąbek andrzej.glabek@nordicsemi.no

This is a follow-up to commit 77ecd68.

Add missing check that looks for a revision specific overlay located
in the `<app>/boards/` directory (before checking the main application
directory, similarly to how normal overlays are handled).

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
@anangl anangl added bug The issue is a bug, or the PR is fixing a bug area: Build System labels Jan 26, 2021
@anangl anangl added this to the v2.5.0 milestone Jan 26, 2021
@anangl anangl requested a review from nashif as a code owner January 26, 2021 12:00
@@ -486,6 +486,9 @@ if(DTC_OVERLAY_FILE)
# variable DTC_OVERLAY_FILE
elseif(DEFINED ENV{DTC_OVERLAY_FILE})
set(DTC_OVERLAY_FILE $ENV{DTC_OVERLAY_FILE})
elseif((DEFINED BOARD_REVISION) AND
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think we should append together, so that you may still have settings common for all revisions of the board in one file and then revision specific overlays in another, as it is already done for shields:

list(APPEND ${FILE_DTS} ${FILE_CONF_FILES}/${filename}.overlay)

zephyr_file(CONF_FILES ${shield_dir}/${s_dir}/boards
DTS shield_dts_files

if possible, it would also be great if this could be using zephyr_file() but that is not required for approving this PR.

@anangl
Copy link
Member Author

anangl commented Feb 2, 2021

Superseded by #31864.

@anangl anangl closed this Feb 2, 2021
@anangl anangl deleted the fix_revision_specific_overlay_handling branch February 2, 2021 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: Build System bug The issue is a bug, or the PR is fixing a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants