From 5ad38828fac83d20e3ca9b60b6293f125751915e Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphaelcoeffic@users.noreply.github.com>
Date: Mon, 5 Aug 2024 02:07:37 +0200
Subject: [PATCH] fix: compiling with DEBUG (#5377)

---
 radio/src/CMakeLists.txt                                  | 1 +
 radio/src/boards/generic_stm32/CMakeLists.txt             | 2 +-
 radio/src/targets/common/arm/stm32/CMakeLists.txt         | 8 ++------
 .../targets/common/arm/stm32/bootloader/CMakeLists.txt    | 7 ++++++-
 radio/src/targets/common/arm/stm32/diskio_sdio.cpp        | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index 176b66639..510af985e 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -546,6 +546,7 @@ add_dependencies(firmware ${RADIO_DEPENDENCIES})
 set_target_properties(firmware PROPERTIES EXCLUDE_FROM_ALL TRUE)
 
 if(DEBUG)
+  target_compile_definitions(board PRIVATE -DDEBUG)
   target_compile_definitions(firmware PRIVATE -DDEBUG)
   target_compile_definitions(stm32_drivers_w_dbg_fw PRIVATE -DDEBUG)
 endif()
diff --git a/radio/src/boards/generic_stm32/CMakeLists.txt b/radio/src/boards/generic_stm32/CMakeLists.txt
index baa94c66a..68f82d44e 100644
--- a/radio/src/boards/generic_stm32/CMakeLists.txt
+++ b/radio/src/boards/generic_stm32/CMakeLists.txt
@@ -14,6 +14,7 @@ set(MINIMAL_BOARD_LIB_SRC
   boards/generic_stm32/inputs.cpp
   boards/generic_stm32/i2c_bus.cpp
   boards/generic_stm32/bl_keys.cpp
+  boards/generic_stm32/aux_ports.cpp
 )
 
 # Dependencies only used in firmware
@@ -25,7 +26,6 @@ set(BOARD_LIB_SRC
 
   boards/generic_stm32/module_ports.cpp
   boards/generic_stm32/trainer_ports.cpp
-  boards/generic_stm32/aux_ports.cpp
   boards/generic_stm32/sport_update.cpp
   boards/generic_stm32/intmodule_heartbeat.cpp
   boards/generic_stm32/analog_inputs.cpp
diff --git a/radio/src/targets/common/arm/stm32/CMakeLists.txt b/radio/src/targets/common/arm/stm32/CMakeLists.txt
index a08c55d9e..8222451c2 100644
--- a/radio/src/targets/common/arm/stm32/CMakeLists.txt
+++ b/radio/src/targets/common/arm/stm32/CMakeLists.txt
@@ -99,16 +99,12 @@ if(NOT NATIVE_BUILD)
   # HAL/LL drivers using TRACE
   add_library(stm32_drivers_w_dbg_fw OBJECT EXCLUDE_FROM_ALL
       ${STM32_DRIVER_DIR}/sdcard_spi.cpp
+      ${STM32_DRIVER_DIR}/diskio_sdio.cpp
   )
   add_library(stm32_drivers_w_dbg_bl OBJECT EXCLUDE_FROM_ALL
       ${STM32_DRIVER_DIR}/sdcard_spi.cpp
-  )
-
-  if(NOT PCB STREQUAL PL18)
-    target_sources(stm32_drivers PUBLIC
       ${STM32_DRIVER_DIR}/diskio_sdio.cpp
-    )
-  endif()
+  )
 
   set(FIRMWARE_SRC ${FIRMWARE_SRC} $<TARGET_OBJECTS:stm32_drivers>)
   set(FIRMWARE_SRC ${FIRMWARE_SRC} $<TARGET_OBJECTS:stm32_drivers_w_dbg_fw>)
diff --git a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
index 238e3b892..06cd09a9e 100644
--- a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
+++ b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
@@ -35,6 +35,7 @@ if(NOT NO_LTO)
   target_compile_options(stm32usb_device_bl PRIVATE -flto)
   target_compile_options(stm32usb_device_fw PRIVATE -flto)
   target_compile_options(stm32_drivers PRIVATE -flto)
+  target_compile_options(stm32_drivers_w_dbg_fw PRIVATE -flto)
   target_compile_options(stm32_drivers_w_dbg_bl PRIVATE -flto)
 endif()
 
@@ -66,7 +67,11 @@ if (DEFINED TARGET_SDRAM_SIZE)
 endif()
 
 if (ENABLE_BOOTLOADER_DEBUG)
-  target_compile_definitions(bootloader PUBLIC -DDEBUG)
+  target_compile_definitions(board_bl PRIVATE -DDEBUG)
+  target_compile_definitions(bootloader PRIVATE -DDEBUG)
+  target_sources(bootloader PRIVATE
+    ${RADIO_SRC_DIR}/serial.cpp
+  )
   # uncomment to enable TRACE in drivers
   # target_compile_definitions(stm32_drivers_w_dbg_bl PRIVATE -DDEBUG)
 endif()
diff --git a/radio/src/targets/common/arm/stm32/diskio_sdio.cpp b/radio/src/targets/common/arm/stm32/diskio_sdio.cpp
index e6f1b25d9..ef52e10da 100644
--- a/radio/src/targets/common/arm/stm32/diskio_sdio.cpp
+++ b/radio/src/targets/common/arm/stm32/diskio_sdio.cpp
@@ -32,7 +32,7 @@
 #include "hal.h"
 
 
-#if !defined(SD_SPI)
+#if defined(STORAGE_USE_SDIO)
 
 // #include "delays_driver.h"
 #include "debug.h"