Skip to content

cmake: include pre_dt_board.cmake from all board directories #93393

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −4
Open

cmake: include pre_dt_board.cmake from all board directories #93393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmake/modules/dts.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ include_guard(GLOBAL)
include(extensions)
include(python)
include(boards)

# Include board specific device-tree flags before parsing.
foreach(dir IN LISTS BOARD_DIRECTORIES)
include("${dir}/pre_dt_board.cmake" OPTIONAL)
Comment on lines +10 to +11
Copy link
Contributor

@tejlmand tejlmand Sep 5, 2025

Choose a reason for hiding this comment

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

this suffers the same issue as described here: #87821 (comment)

endforeach()

include(pre_dt)
find_package(HostTools)
find_package(Dtc 1.4.6)
Expand Down
4 changes: 0 additions & 4 deletions cmake/modules/zephyr_default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ list(APPEND zephyr_cmake_modules hwm_v2)
list(APPEND zephyr_cmake_modules configuration_files)
list(APPEND zephyr_cmake_modules generated_file_directories)

# Include board specific device-tree flags before parsing.
set(pre_dt_board "\${BOARD_DIR}/pre_dt_board.cmake" OPTIONAL)
list(APPEND zephyr_cmake_modules "\${pre_dt_board}")

# DTS should be close to kconfig because CONFIG_ variables from
# kconfig and dts should be available at the same time.
list(APPEND zephyr_cmake_modules dts)
Expand Down