[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]>
nrfconnect · Aug 15, 2019 · 034c048 · 034c048
1 parent 0cf7965
commit 034c048
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt
@@ -18,18 +18,18 @@ endif()
 # and fits inside, the boot partition. (If the user specified a
 # DTC_OVERLAY_FILE on the CMake command line, we need to append onto
 # the list).
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/dts.overlay"
+if(${IMAGE}DTC_OVERLAY_FILE)
+  set(${IMAGE}DTC_OVERLAY_FILE
+    "${${IMAGE}DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/dts.overlay"
     CACHE STRING "" FORCE
     )
 else()
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/dts.overlay)
+  set(${IMAGE}DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/dts.overlay)
 endif()
 
 if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}.overlay)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}.overlay"
+  set(${IMAGE}DTC_OVERLAY_FILE
+    "${${IMAGE}DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}.overlay"
     CACHE STRING "" FORCE
     )
 endif()