diff --git a/CMakeLists.txt b/CMakeLists.txt
index 648b0e61fc..126449cb14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,6 +152,7 @@ function(mbed_set_mbed_target_linker_script target)
             INTERFACE
                 "--scatter=${mbed_target_linker_script}"
                 "--predefine=${_linker_preprocess_definitions}"
+                "--map"
         )
     endif()
     add_custom_command(
diff --git a/tools/cmake/toolchains/ARM.cmake b/tools/cmake/toolchains/ARM.cmake
index 1cd4c09da5..f3ea01393b 100644
--- a/tools/cmake/toolchains/ARM.cmake
+++ b/tools/cmake/toolchains/ARM.cmake
@@ -39,10 +39,6 @@ function(mbed_set_toolchain_options target)
             $<$<COMPILE_LANGUAGE:ASM>:--target=arm-arm-none-eabi -masm=auto>
     )
 
-    list(APPEND link_options
-        "--map"
-    )
-
     # Add linking time preprocessor macro for TFM targets
     if(MBED_CPU_CORE MATCHES "\-NS$")
         list(APPEND link_options