[nrf noup] cmake: multiimage: app mem partition flexibility

This commits adds ${IMAGE} in order to support multiimage in the app
memory partition feature

Signed-off-by: Torsten Rasmussen <[email protected]>

Author: tejlmand

CMakeLists.txt

@@ -1086,7 +1086,7 @@ if(CONFIG_USERSPACE)
     -d ${OBJ_FILE_DIR}
     -o ${APP_SMEM_UNALIGNED_LD}
     ${NEWLIB_PART} ${MBEDTLS_PART}
-    $<TARGET_PROPERTY:zephyr_property_target,COMPILE_OPTIONS>
+    $<TARGET_PROPERTY:${IMAGE}zephyr_property_target,COMPILE_OPTIONS>
     $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
     DEPENDS
     kernel
@@ -1137,7 +1137,7 @@ if(CONFIG_USERSPACE)
     -e $<TARGET_FILE:app_smem_unaligned_prebuilt>
     -o ${APP_SMEM_ALIGNED_LD}
     ${NEWLIB_PART} ${MBEDTLS_PART}
-    $<TARGET_PROPERTY:zephyr_property_target,COMPILE_OPTIONS>
+    $<TARGET_PROPERTY:${IMAGE}zephyr_property_target,COMPILE_OPTIONS>
     $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
     DEPENDS
     ${KERNEL_LIBRARY}

cmake/app/boilerplate.cmake

@@ -635,7 +635,7 @@ endif()
 #
 # Currently used properties:
 # - COMPILES_OPTIONS: Used by application memory partition feature
-add_custom_target(zephyr_property_target)
+add_custom_target(${IMAGE}zephyr_property_target)
 
 # "app" is a CMake library containing all the application code and is
 # modified by the entry point ${APPLICATION_SOURCE_DIR}/CMakeLists.txt

cmake/extensions.cmake

@@ -531,7 +531,7 @@ endfunction()
 # Note: Ensure the given partition has been define using
 #       K_APPMEM_PARTITION_DEFINE in source code.
 function(zephyr_library_app_memory partition)
-  set_property(TARGET zephyr_property_target
+  set_property(TARGET ${IMAGE}zephyr_property_target
                APPEND PROPERTY COMPILE_OPTIONS
                "-l" $<TARGET_FILE_NAME:${ZEPHYR_CURRENT_LIBRARY}> "${partition}")
 endfunction()