Skip to content

Commit a1c6bf0

Browse files
committed
[nrf fromlist] cmake: image-ify DTC_OVERLAY_FILE
Contained in upstream pr #430 This variable is per image, treat it is such. Signed-off-by: Håkon Øye Amundsen <[email protected]>
1 parent 09b7220 commit a1c6bf0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

boot/zephyr/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ endif()
1818
# and fits inside, the boot partition. (If the user specified a
1919
# DTC_OVERLAY_FILE on the CMake command line, we need to append onto
2020
# the list).
21-
if(DTC_OVERLAY_FILE)
22-
set(DTC_OVERLAY_FILE
23-
"${DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/dts.overlay"
21+
if(${IMAGE}DTC_OVERLAY_FILE)
22+
set(${IMAGE}DTC_OVERLAY_FILE
23+
"${${IMAGE}DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/dts.overlay"
2424
CACHE STRING "" FORCE
2525
)
2626
else()
27-
set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/dts.overlay)
27+
set(${IMAGE}DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/dts.overlay)
2828
endif()
2929

3030
if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}.overlay)
31-
set(DTC_OVERLAY_FILE
32-
"${DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}.overlay"
31+
set(${IMAGE}DTC_OVERLAY_FILE
32+
"${${IMAGE}DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}.overlay"
3333
CACHE STRING "" FORCE
3434
)
3535
endif()

0 commit comments

Comments
 (0)