diff --git a/targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G431xB/TARGET_NUCLEO_G431KB/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G431xB/TARGET_NUCLEO_G431KB/CMakeLists.txt
index 8719022d68..8906b70006 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G431xB/TARGET_NUCLEO_G431KB/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G431xB/TARGET_NUCLEO_G431KB/CMakeLists.txt
@@ -12,3 +12,5 @@ target_include_directories(mbed-nucleo-g431kb
     INTERFACE
         .
 )
+
+target_link_libraries(mbed-nucleo-g431kb INTERFACE mbed-stm32g431xb)
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/CMakeLists.txt
index 6774c98b33..48a0833773 100644
--- a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory(TARGET_STM32H747xI_CM4 EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32H747xI_CM7 EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_DISCO_H747I EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_PORTENTA_H7 EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM32H747xI_CM7 EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM32H747xI_CM4 EXCLUDE_FROM_ALL)
 
 add_library(mbed-stm32h747xi INTERFACE)
 
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I/CMakeLists.txt
index 2a398afa43..6631f16d24 100644
--- a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I/CMakeLists.txt
@@ -13,10 +13,34 @@ target_include_directories(mbed-disco-h747i
         .
 )
 
-target_link_libraries(mbed-disco-h747i INTERFACE mbed-stm32h747xi mbed-stm32h747xi-cm7)
+target_link_libraries(mbed-disco-h747i INTERFACE mbed-stm32h747xi-cm7)
+
 
 add_library(mbed-disco-h747i-cm7 INTERFACE)
-target_link_libraries(mbed-disco-h747i-cm7 INTERFACE mbed-stm32h747xi mbed-stm32h747xi-cm7)
+
+target_sources(mbed-disco-h747i-cm7
+    INTERFACE
+        PeripheralPins.c
+)
+
+target_include_directories(mbed-disco-h747i-cm7
+    INTERFACE
+        .
+)
+
+target_link_libraries(mbed-disco-h747i-cm7 INTERFACE mbed-stm32h747xi-cm7)
+
 
 add_library(mbed-disco-h747i-cm4 INTERFACE)
-target_link_libraries(mbed-disco-h747i-cm4 INTERFACE mbed-stm32h747xi mbed-stm32h747xi-cm4)
+
+target_sources(mbed-disco-h747i-cm4
+    INTERFACE
+        PeripheralPins.c
+)
+
+target_include_directories(mbed-disco-h747i-cm4
+    INTERFACE
+        .
+)
+
+target_link_libraries(mbed-disco-h747i-cm4 INTERFACE mbed-stm32h747xi-cm4)
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/CMakeLists.txt
index d01e33b9d4..c11c3e4657 100644
--- a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/CMakeLists.txt
@@ -1,18 +1,35 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-portenta-h7 INTERFACE)
+add_library(mbed-portenta-h7-m4 INTERFACE)
 
-target_sources(mbed-portenta-h7
+target_sources(mbed-portenta-h7-m4
     INTERFACE
         PeripheralPins.c
         system_clock_override.c
         portenta_power.cpp
 )
 
-target_include_directories(mbed-portenta-h7
+target_include_directories(mbed-portenta-h7-m4
     INTERFACE
         .
 )
 
-target_link_libraries(mbed-portenta-h7 INTERFACE mbed-stm32h747xi)
+target_link_libraries(mbed-portenta-h7-m4 INTERFACE mbed-stm32h747xi-cm4)
+
+
+add_library(mbed-portenta-h7-m7 INTERFACE)
+
+target_sources(mbed-portenta-h7-m7
+    INTERFACE
+        PeripheralPins.c
+        system_clock_override.c
+        portenta_power.cpp
+)
+
+target_include_directories(mbed-portenta-h7-m7
+    INTERFACE
+        .
+)
+
+target_link_libraries(mbed-portenta-h7-m7 INTERFACE mbed-stm32h747xi-cm7)
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L073xZ/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L073xZ/CMakeLists.txt
index 8b9786d91e..c43b3c206b 100644
--- a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L073xZ/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L073xZ/CMakeLists.txt
@@ -5,7 +5,7 @@ add_subdirectory(TARGET_NUCLEO_L073RZ EXCLUDE_FROM_ALL)
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32l073xx.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32l073xz.ld)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32L073XZ.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32l073xx.S)
     set(LINKER_FILE TOOLCHAIN_ARM/stm32l073xz.sct)
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R5xI/TARGET_NUCLEO_L4R5ZI/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R5xI/TARGET_NUCLEO_L4R5ZI/CMakeLists.txt
index 16a276700d..4507fec656 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R5xI/TARGET_NUCLEO_L4R5ZI/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R5xI/TARGET_NUCLEO_L4R5ZI/CMakeLists.txt
@@ -14,3 +14,7 @@ target_include_directories(mbed-nucleo-l4r5zi
 )
 
 target_link_libraries(mbed-nucleo-l4r5zi INTERFACE mbed-stm32l4r5xi)
+
+
+add_library(mbed-nucleo-l4r5zi-p INTERFACE)
+target_link_libraries(mbed-nucleo-l4r5zi-p INTERFACE mbed-nucleo-l4r5zi)