From 034c0485a0754f87b947d2043d6cfdac48282836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=98ye=20Amundsen?= Date: Wed, 15 May 2019 11:22:47 +0000 Subject: [PATCH] [nrf fromlist] cmake: image-ify DTC_OVERLAY_FILE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Contained in upstream pr #430 This variable is per image, treat it is such. Signed-off-by: Håkon Øye Amundsen --- boot/zephyr/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt index bfd6838f0..2f3d4d527 100644 --- 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()