Skip to content

Commit d3f92f6

Browse files
[nrf temphack] cmake: carry forward dts.cmake patches from a mergeup
Mergeup commit 1378a1c made changes to cmake/dts.cmake which I'm carrying forward in a separate patch for now. Need more clarity from Robert or Sebastian on what "ought" to happen to this patch: 1. squash into multi-image? 2. submit upstream? Signed-off-by: Marti Bolivar <[email protected]> Signed-off-by: Robert Lubos <[email protected]> Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit b5e975a) Signed-off-by: Martí Bolívar <[email protected]>
1 parent 273e633 commit d3f92f6

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

cmake/dts.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ list(APPEND
2828
${BOARD_DIR}
2929
${ZEPHYR_BASE}
3030
)
31+
list(REMOVE_DUPLICATES
32+
DTS_ROOT
33+
)
3134

3235
set(dts_files
3336
${DTS_SOURCE}
@@ -74,6 +77,7 @@ if(SUPPORTS_DTS)
7477
math(EXPR i "${i}+1")
7578
endforeach()
7679

80+
unset(DTS_ROOT_SYSTEM_INCLUDE_DIRS)
7781
foreach(dts_root ${DTS_ROOT})
7882
foreach(dts_root_path
7983
include
@@ -91,6 +95,7 @@ if(SUPPORTS_DTS)
9195
endforeach()
9296
endforeach()
9397

98+
unset(DTS_ROOT_BINDINGS)
9499
foreach(dts_root ${DTS_ROOT})
95100
set(full_path ${dts_root}/dts/bindings)
96101
if(EXISTS ${full_path})

0 commit comments

Comments
 (0)