Merge pull request #13904 from 0xc0170/fix_disco_cmake

CMake STM32L475xG: fix linker/startup inclusion

Author: 0xc0170

targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/CMakeLists.txt

@@ -5,30 +5,18 @@ if("DISCO_L475VG_IOT01A" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_DISCO_L475VG_IOT01A)
 endif()
 
-function(_mbed_get_assembly_stm32l475xg)
-    if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-        set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32l475xx.S)
-    elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-        set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32l475xx.S)
-    elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
-        set(STARTUP_FILE TOOLCHAIN_IAR/startup_stm32l475xx.S)
-    endif()
-    target_sources(mbed-core INTERFACE ${STARTUP_FILE})
-endfunction()
-
-function(_mbed_set_linker_file_stm32l475xg)
-    if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-        set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_GCC_ARM/stm32l475xg.ld)
-    elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-        set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_ARM/stm32l475xg.sct)
-    elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
-        set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_IAR/stm32l475xg.icf)
-    endif()
-    set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${LINKER_FILE})
-endfunction()
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32l475xx.S)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32l475xg.ld)
+elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32l475xx.S)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32l475xg.sct)
+elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
+    set(STARTUP_FILE TOOLCHAIN_IAR/startup_stm32l475xx.S)
+    set(LINKER_FILE TOOLCHAIN_IAR/stm32l475xg.icf)
+endif()
 
-_mbed_get_assembly_stm32l475xg()
-_mbed_set_linker_file_stm32l475xg()
+set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
 target_include_directories(mbed-core
     INTERFACE
@@ -37,5 +25,6 @@ target_include_directories(mbed-core
 
 target_sources(mbed-core
     INTERFACE
+        ${STARTUP_FILE}
         system_clock.c
 )