From ea49cd0b1a62a7bb41b9d0fb87e905b291113196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B8e?= Date: Wed, 3 Apr 2019 15:14:37 +0200 Subject: [PATCH] cmake: Fix bug where dts.overlay was not being appended MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix bug #399 where dts.overlay was not being appended. The build scripts were erroneously modifying the shadowed non-cache variable instead of the cache variable. Signed-off-by: Sebastian Bøe --- boot/zephyr/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt index fa7b03b4..cb4fecaf 100644 --- a/boot/zephyr/CMakeLists.txt +++ b/boot/zephyr/CMakeLists.txt @@ -16,14 +16,18 @@ set(BOARD qemu_x86) # the list). if(DTC_OVERLAY_FILE) set(DTC_OVERLAY_FILE - "${DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/dts.overlay") + "${DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/dts.overlay" + CACHE STRING "" FORCE + ) else() set(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") + "${DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}.overlay" + CACHE STRING "" FORCE + ) endif() # Enable Zephyr runner options which request mass erase if so