From 02eeeb779665f126f59c185430d854bc7392f18e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=98ye=20Amundsen?= Date: Tue, 18 Jun 2019 19:53:54 +0000 Subject: [PATCH] [nrf toup] cmake: imageify OVERLAY_CONFIG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently what is provided in -DOVERLAY_CONFIG will be applied to all images, this is incorrect. This patch ensures that the overlay config is only applied to a single image. Note that it is also possible to specify which image it should apply to by providing the image name as a prefix in the command. E.g. '-Dspm_OVERLAY_CONFIG' Signed-off-by: Håkon Øye Amundsen --- cmake/kconfig.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/kconfig.cmake b/cmake/kconfig.cmake index 1ae8bee8185174..16463d85082080 100644 --- a/cmake/kconfig.cmake +++ b/cmake/kconfig.cmake @@ -22,8 +22,8 @@ if(${IMAGE}CONF_FILE) string(REPLACE " " ";" ${IMAGE}CONF_FILE_AS_LIST "${${IMAGE}CONF_FILE}") endif() -if(OVERLAY_CONFIG) - string(REPLACE " " ";" OVERLAY_CONFIG_AS_LIST "${OVERLAY_CONFIG}") +if(${IMAGE}OVERLAY_CONFIG) + string(REPLACE " " ";" ${IMAGE}OVERLAY_CONFIG_AS_LIST "${${IMAGE}OVERLAY_CONFIG}") endif() set(ENV{srctree} ${ZEPHYR_BASE}) @@ -118,7 +118,7 @@ set( ${BOARD_DEFCONFIG} ${${IMAGE}CONF_FILE_AS_LIST} ${shield_conf_files} - ${OVERLAY_CONFIG_AS_LIST} + ${${IMAGE}OVERLAY_CONFIG_AS_LIST} ${EXTRA_KCONFIG_OPTIONS_FILE} ${config_files} )