From 1bbceb48f084034d6f61acc0ccda75e0149a8374 Mon Sep 17 00:00:00 2001
From: jeromecoutant <jerome.coutant@st.com>
Date: Fri, 15 Jan 2021 11:22:41 +0100
Subject: [PATCH] STM32 / CMAKE / targets : correct CMakeLists.txt files

---
 targets/TARGET_STM/CMakeLists.txt                    |  1 +
 .../TARGET_STM32F1/TARGET_STM32F103xB/CMakeLists.txt |  9 ++++++++-
 .../TARGET_MTS_DRAGONFLY_F411RE/CMakeLists.txt       |  1 +
 .../TARGET_STM32F4/TARGET_STM32F407xE/CMakeLists.txt |  8 ++++----
 .../TARGET_STM32F7/TARGET_STM32F767xI/CMakeLists.txt |  8 ++++----
 .../TARGET_STM32L0/TARGET_STM32L072xZ/CMakeLists.txt |  1 +
 .../TARGET_STM32L0/TARGET_STM32L073xZ/CMakeLists.txt |  1 +
 .../TARGET_STM32L1/TARGET_MOTE_L152RC/CMakeLists.txt |  8 ++++----
 .../TARGET_NUCLEO_L152RE/CMakeLists.txt              |  2 +-
 .../TARGET_STM32L4/TARGET_STM32L432xC/CMakeLists.txt |  6 +++++-
 .../TARGET_STM32L4/TARGET_STM32L433xC/CMakeLists.txt |  6 +++++-
 .../TARGET_STM32L4/TARGET_STM32L443xC/CMakeLists.txt |  1 +
 .../TARGET_STM32L4/TARGET_STM32L476xG/CMakeLists.txt |  2 +-
 .../TARGET_STM32L4/TARGET_STM32L486xG/CMakeLists.txt |  1 -
 .../TARGET_DISCO_L496AG}/CMakeLists.txt              |  0
 .../TARGET_DISCO_L496AG/CMakeListst.txt              | 12 ------------
 targets/TARGET_STM/TARGET_STM32L5/CMakeLists.txt     |  1 +
 .../TARGET_STM32L5/TARGET_STM32L552xE/CMakeLists.txt |  4 ++--
 targets/TARGET_STM/TARGET_STM32WB/CMakeLists.txt     |  2 +-
 19 files changed, 41 insertions(+), 33 deletions(-)
 rename targets/TARGET_STM/TARGET_STM32L4/{TARGET_STM32L432xC/TARGET_NUCLEO_L432KC => TARGET_STM32L496xG/TARGET_DISCO_L496AG}/CMakeLists.txt (100%)
 delete mode 100644 targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/CMakeListst.txt

diff --git a/targets/TARGET_STM/CMakeLists.txt b/targets/TARGET_STM/CMakeLists.txt
index ca0cda9c55..ef6bb9677c 100644
--- a/targets/TARGET_STM/CMakeLists.txt
+++ b/targets/TARGET_STM/CMakeLists.txt
@@ -49,6 +49,7 @@ target_sources(mbed-core
         lp_ticker.c
         mbed_crc_api.c
         mbed_overrides.c
+        ospi_api.c
         pinmap.c
         port_api.c
         pwmout_api.c
diff --git a/targets/TARGET_STM/TARGET_STM32F1/TARGET_STM32F103xB/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F1/TARGET_STM32F103xB/CMakeLists.txt
index a3a339e0e8..d089f9f3fb 100644
--- a/targets/TARGET_STM/TARGET_STM32F1/TARGET_STM32F103xB/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F1/TARGET_STM32F103xB/CMakeLists.txt
@@ -1,6 +1,12 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+if("NUCLEO_F103RB" IN_LIST MBED_TARGET_LABELS)
+    target_include_directories(mbed-core INTERFACE TARGET_NUCLEO_F103RB)
+    set(PERIPHERALPINS_FILE TARGET_NUCLEO_F103RB/PeripheralPins.c)
+    set(SYSTEM_CLOCK_FILE system_clock.c)
+endif()
+
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f103xb.S)
     set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32f103xb.ld)
@@ -13,8 +19,9 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
 
 target_sources(mbed-core
     INTERFACE
-        system_clock.c
+        ${PERIPHERALPINS_FILE}
         ${STARTUP_FILE}
+        ${SYSTEM_CLOCK_FILE}
 )
 
 target_include_directories(mbed-core
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/CMakeLists.txt
index b55aed63e2..b949f92e4a 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/CMakeLists.txt
@@ -15,6 +15,7 @@ target_sources(mbed-core
     INTERFACE
         system_clock.c
         ONBOARD_TELIT_HE910.cpp
+        PeripheralPins.c
         ${STARTUP_FILE}
 )
 
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xE/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xE/CMakeLists.txt
index c37680db00..432767614d 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xE/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xE/CMakeLists.txt
@@ -6,11 +6,11 @@ if("ARCH_MAX" IN_LIST MBED_TARGET_LABELS)
 endif()
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f401xe.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32F401XE.ld)
+    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f407xx.S)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32F407XG.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f401xe.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32f401xe.sct)
+    set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f407xx.S)
+    set(LINKER_FILE TOOLCHAIN_ARM/STM32F407xx.sct)
 endif()
 
 set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
diff --git a/targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/CMakeLists.txt
index 27ea95e3e1..d29dc1a30c 100644
--- a/targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/CMakeLists.txt
@@ -8,11 +8,11 @@ elseif("UHURU_RAVEN" IN_LIST MBED_TARGET_LABELS)
 endif()
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f756xx.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32F756xG.ld)
+    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f767xx.S)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32F767xI.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f756xx.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32f756xg.sct)
+    set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f767xx.S)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32f767xi.sct)
 endif()
 
 set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L072xZ/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L072xZ/CMakeLists.txt
index 80e411d045..31604cb5dd 100644
--- a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L072xZ/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L072xZ/CMakeLists.txt
@@ -18,6 +18,7 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
 target_sources(mbed-core
     INTERFACE
         ${STARTUP_FILE}
+        system_clock.c
 )
 
 target_include_directories(mbed-core
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L073xZ/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L073xZ/CMakeLists.txt
index deaf552828..35bc853fa8 100644
--- a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L073xZ/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L073xZ/CMakeLists.txt
@@ -18,6 +18,7 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
 target_sources(mbed-core
     INTERFACE
         ${STARTUP_FILE}
+        system_clock.c
 )
 
 target_include_directories(mbed-core
diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/CMakeLists.txt
index 39c303fecb..cb2b531171 100644
--- a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/CMakeLists.txt
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-    set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_stm32l152xe.S)
-    set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/stm32l152re.ld)
+    set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_stm32l152xc.S)
+    set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/STM32L152XC.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    set(STARTUP_FILE device/TOOLCHAIN_ARM/startup_stm32l152xe.S)
-    set(LINKER_FILE device/TOOLCHAIN_ARM/stm32l152re.sct)
+    set(STARTUP_FILE device/TOOLCHAIN_ARM/startup_stm32l152xc.S)
+    set(LINKER_FILE device/TOOLCHAIN_ARM/stm32l152rc.sct)
 endif()
 
 set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/CMakeLists.txt
index 39c303fecb..33f182d4fe 100644
--- a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_stm32l152xe.S)
-    set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/stm32l152re.ld)
+    set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/STM32L152XE.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE device/TOOLCHAIN_ARM/startup_stm32l152xe.S)
     set(LINKER_FILE device/TOOLCHAIN_ARM/stm32l152re.sct)
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/CMakeLists.txt
index f4db8b6cb2..dfb21d9298 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/CMakeLists.txt
@@ -2,7 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if("NUCLEO_L432KC" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_NUCLEO_L432KC)
+    target_include_directories(mbed-core INTERFACE TARGET_NUCLEO_L432KC)
+    set(PERIPHERALPINS_FILE TARGET_NUCLEO_L432KC/PeripheralPins.c)
+    set(SYSTEM_CLOCK_FILE system_clock.c)
 endif()
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
@@ -17,7 +19,9 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
 
 target_sources(mbed-core
     INTERFACE
+        ${PERIPHERALPINS_FILE}
         ${STARTUP_FILE}
+        ${SYSTEM_CLOCK_FILE}
 )
 
 target_include_directories(mbed-core
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L433xC/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L433xC/CMakeLists.txt
index aacc6d489a..1eec1a40b2 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L433xC/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L433xC/CMakeLists.txt
@@ -2,7 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if("NUCLEO_L433RC_P" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_NUCLEO_L433RC_P)
+    target_include_directories(mbed-core INTERFACE TARGET_NUCLEO_L433RC_P)
+    set(PERIPHERALPINS_FILE TARGET_NUCLEO_L433RC_P/PeripheralPins.c)
+    set(SYSTEM_CLOCK_FILE system_clock.c)
 endif()
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
@@ -17,7 +19,9 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
 
 target_sources(mbed-core
     INTERFACE
+        ${PERIPHERALPINS_FILE}
         ${STARTUP_FILE}
+        ${SYSTEM_CLOCK_FILE}
 )
 
 target_include_directories(mbed-core
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/CMakeLists.txt
index 0d52272dda..7462639c55 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/CMakeLists.txt
@@ -18,6 +18,7 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
 target_sources(mbed-core
     INTERFACE
         ${STARTUP_FILE}
+        system_clock.c
 )
 
 target_include_directories(mbed-core
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/CMakeLists.txt
index becaebdb01..68cfdb3a69 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if("DISCO_L476VG" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_MTS_DRAGONFLY_L471QG)
+    add_subdirectory(TARGET_DISCO_L476VG)
 elseif("NUCLEO_L476RG" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_NUCLEO_L476RG)
 elseif("RHOMBIO_L476DMW1K" IN_LIST MBED_TARGET_LABELS)
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/CMakeLists.txt
index c8c1d0693b..d4e54c49ee 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/CMakeLists.txt
@@ -19,7 +19,6 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
 
 target_sources(mbed-core
     INTERFACE
-        system_clock.c
         ${STARTUP_FILE}
 )
 
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TARGET_NUCLEO_L432KC/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/CMakeLists.txt
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TARGET_NUCLEO_L432KC/CMakeLists.txt
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/CMakeLists.txt
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/CMakeListst.txt b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/CMakeListst.txt
deleted file mode 100644
index 118fbc1189..0000000000
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/CMakeListst.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-target_sources(mbed-core
-    INTERFACE
-        PeripheralPins.c
-)
-
-target_include_directories(mbed-core
-    INTERFACE
-        .
-)
diff --git a/targets/TARGET_STM/TARGET_STM32L5/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L5/CMakeLists.txt
index be41ea8cdc..a94f2281dc 100644
--- a/targets/TARGET_STM/TARGET_STM32L5/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L5/CMakeLists.txt
@@ -19,6 +19,7 @@ target_sources(mbed-core
         gpio_irq_device.c
         pwmout_device.c
         serial_device.c
+        system_clock.c
         spi_api.c
 )
 
diff --git a/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L552xE/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L552xE/CMakeLists.txt
index 5da6f7576d..5bc342d532 100644
--- a/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L552xE/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L552xE/CMakeLists.txt
@@ -7,10 +7,10 @@ endif()
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32l552xx.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32l552xc.ld)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32l552xe.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32l552xx.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32l552xc.sct)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32l552xe.sct)
 endif()
 
 set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
diff --git a/targets/TARGET_STM/TARGET_STM32WB/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32WB/CMakeLists.txt
index 7f38e9d3e4..d347e194fd 100644
--- a/targets/TARGET_STM/TARGET_STM32WB/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32WB/CMakeLists.txt
@@ -12,12 +12,12 @@ add_subdirectory(STM32Cube_FW)
 target_sources(mbed-core
     INTERFACE
         analogin_device.c
-        analogout_device.c
         flash_api.c
         gpio_irq_device.c
         pwmout_device.c
         serial_device.c
         spi_api.c
+        wb_sleep.c
 )
 
 target_include_directories(mbed-core