From c6c3fed492e0f49679f5c6230dfc955c72f4ffaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B8e?= Date: Thu, 1 Aug 2019 16:23:49 +0200 Subject: [PATCH] [nrf noup] cmake: Add an IMAGE prefix to several new targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add an IMAGE prefix to new targets that have been introduced. Signed-off-by: Sebastian Bøe --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2cad52737591c..66aa1ed74be722 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -355,8 +355,8 @@ zephyr_cc_option(-fmacro-prefix-map=${ZEPHYR_BASE}=ZEPHYR_BASE) # Declare MPU userspace dependencies before the linker scripts to make # sure the order of dependencies are met if(CONFIG_USERSPACE) - set(APP_SMEM_ALIGNED_DEP app_smem_aligned_linker) - set(APP_SMEM_UNALIGNED_DEP app_smem_unaligned_linker) + set(APP_SMEM_ALIGNED_DEP ${IMAGE}app_smem_aligned_linker) + set(APP_SMEM_UNALIGNED_DEP ${IMAGE}app_smem_unaligned_linker) if(CONFIG_ARM) set(PRIV_STACK_DEP ${PRIV_STACKS_PREBUILT}) endif() @@ -661,7 +661,7 @@ endforeach() get_property(OUTPUT_FORMAT GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT) if (CONFIG_CODE_DATA_RELOCATION) - set(CODE_RELOCATION_DEP code_relocation_source_lib) + set(CODE_RELOCATION_DEP ${IMAGE}code_relocation_source_lib) endif() # CONFIG_CODE_DATA_RELOCATION configure_linker_script(