Skip to content

Commit

Permalink
[nrf noup] cmake: Add an IMAGE prefix to several new targets
Browse files Browse the repository at this point in the history
Add an IMAGE prefix to new targets that have been introduced.

Signed-off-by: Sebastian Bøe <[email protected]>
  • Loading branch information
SebastianBoe authored and mbolivar-nordic committed Aug 9, 2019
1 parent 7ff0650 commit c6c3fed
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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(
Expand Down

0 comments on commit c6c3fed

Please sign in to comment.