From 07db986d6a3fdaa2c633510addb027b111ed8c6e Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Fri, 14 Oct 2022 11:41:11 +0200
Subject: [PATCH] More cleanup

---
 .../arm/stm32/bootloader/CMakeLists.txt       | 12 ---------
 .../common/arm/stm32/f4/CMakeLists.txt        | 26 ++++++++++++++-----
 radio/src/targets/horus/CMakeLists.txt        |  9 -------
 radio/src/targets/nv14/CMakeLists.txt         | 11 --------
 4 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
index fd6382395..d5487eb56 100644
--- a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
+++ b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
@@ -1,18 +1,6 @@
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
-if(CPU_TYPE_FULL STREQUAL STM32F429xI)
-  set(BOOTLOADER_SRC ${BOOTLOADER_SRC}
-    ../../../../../targets/${TARGET_DIR}/startup_stm32f42_43xxx.s
-    )
-elseif(CPU_TYPE_FULL STREQUAL STM32F407xE)
-  set(BOOTLOADER_SRC ${BOOTLOADER_SRC}
-    ../../../../../targets/${TARGET_DIR}/startup_stm32f40_41xxx.s
-    )
-else()
-  # startup file is already included from CMSIS in F2 CMakeLists.txt
-endif()
-
 set(BOOTLOADER_SRC
   ${BOOTLOADER_SRC}
   ../../../../../gui/${GUI_DIR}/lcd.cpp
diff --git a/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt b/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt
index 762939c2c..29c262380 100644
--- a/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt
+++ b/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt
@@ -39,7 +39,7 @@ add_definitions(-DSTM32F4)
 
 set(STM32_STDPERIPH_DIR ${STM32LIB_DIR}/STM32F4xx_StdPeriph_Driver)
 
-add_library(stm32_stdperiph OBJECT EXCLUDE_FROM_ALL
+set(STM32_STDPERIPH_SRC
   targets/common/arm/stm32/f4/system_stm32f4xx.c
   ${STM32_STDPERIPH_DIR}/src/misc.c
   ${STM32_STDPERIPH_DIR}/src/stm32f4xx_gpio.c
@@ -52,11 +52,25 @@ add_library(stm32_stdperiph OBJECT EXCLUDE_FROM_ALL
   ${STM32_STDPERIPH_DIR}/src/stm32f4xx_pwr.c
   ${STM32_STDPERIPH_DIR}/src/stm32f4xx_usart.c
   ${STM32_STDPERIPH_DIR}/src/stm32f4xx_adc.c
-  ${STM32_STDPERIPH_DIR}/src/stm32f4xx_fmc.c
-  ${STM32_STDPERIPH_DIR}/src/stm32f4xx_ltdc.c
-  ${STM32_STDPERIPH_DIR}/src/stm32f4xx_dma.c
-  ${STM32_STDPERIPH_DIR}/src/stm32f4xx_dma2d.c
-  ${STM32_STDPERIPH_DIR}/src/stm32f4xx_sdio.c
+)
+
+if(CPU_TYPE_FULL STREQUAL STM32F429xI)
+  set(STM32_STDPERIPH_SRC ${STM32_STDPERIPH_SRC}
+    targets/${TARGET_DIR}/startup_stm32f42_43xxx.s
+    ${STM32_STDPERIPH_DIR}/src/stm32f4xx_fmc.c
+    ${STM32_STDPERIPH_DIR}/src/stm32f4xx_ltdc.c
+    ${STM32_STDPERIPH_DIR}/src/stm32f4xx_dma.c
+    ${STM32_STDPERIPH_DIR}/src/stm32f4xx_dma2d.c
+    ${STM32_STDPERIPH_DIR}/src/stm32f4xx_sdio.c
+    )
+elseif()
+  set(STM32_STDPERIPH_SRC ${STM32_STDPERIPH_SRC}
+    targets/${TARGET_DIR}/startup_stm32f40_41xxx.s
+    )  
+endif()
+
+add_library(stm32_stdperiph OBJECT EXCLUDE_FROM_ALL
+  ${STM32_STDPERIPH_SRC}
   )
 
 set(FIRMWARE_SRC ${FIRMWARE_SRC} $<TARGET_OBJECTS:stm32_stdperiph>)
diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt
index 016a7924a..70682e7d0 100644
--- a/radio/src/targets/horus/CMakeLists.txt
+++ b/radio/src/targets/horus/CMakeLists.txt
@@ -289,7 +289,6 @@ set(FIRMWARE_TARGET_SRC
   backlight_driver.cpp
   led_driver.cpp
   sdram_driver.c
-  startup_stm32f42_43xxx.s
   )
 
 set(FIRMWARE_SRC
@@ -332,14 +331,6 @@ endif()
 # Make malloc() thread-safe
 add_definitions(-DTHREADSAFE_MALLOC)
 
-set(STM32LIB_SRC
-  STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sdio.c
-  STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fmc.c
-  STM32F4xx_StdPeriph_Driver/src/stm32f4xx_ltdc.c
-  STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c
-  STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma2d.c
-  )
-
 if(PYTHONINTERP_FOUND)
   add_custom_command(
     OUTPUT ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index ee6bd04bf..7ab9bef4c 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -135,7 +135,6 @@ endif()
 set(FIRMWARE_TARGET_SRC
   ${FIRMWARE_TARGET_SRC}
   board.cpp
-  startup_stm32f42_43xxx.s
   ${LCD_DRIVER}
   ${TOUCH_DRIVER}
   sdram_driver.c
@@ -165,16 +164,6 @@ set(FIRMWARE_SRC
 # Make malloc() thread-safe
 add_definitions(-DTHREADSAFE_MALLOC)
 
-set(STM32LIB_SRC
-  STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sdio.c
-  STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fmc.c
-  STM32F4xx_StdPeriph_Driver/src/stm32f4xx_ltdc.c
-  STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c
-  STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma2d.c
-  STM32F4xx_StdPeriph_Driver/src/stm32f4xx_exti.c
-  STM32F4xx_StdPeriph_Driver/src/stm32f4xx_syscfg.c
-  )
-
 if(PYTHONINTERP_FOUND)
   add_custom_command(
     OUTPUT ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp