[nrf toup] cmake: imageify OVERLAY_CONFIG

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 <[email protected]>
joerchan · Aug 9, 2019 · 02eeeb7 · 02eeeb7
1 parent ec52cc7
commit 02eeeb7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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}
 )