From baea859c8c33a62a87f22649b2920cac28f09e12 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Mon, 22 Mar 2021 15:59:13 +0100
Subject: [PATCH] compile fixes

---
 radio/src/CMakeLists.txt                         | 16 +++++++++++-----
 radio/src/debug.h                                |  4 +---
 .../src/targets/common/arm/stm32/board_common.h  |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index 19bdc7933..540af5c10 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -63,6 +63,12 @@ set(FIRMWARE_C_FLAGS_DEBUG "-g" CACHE STRING "Additional flags for firmware targ
 set(FIRMWARE_CXX_FLAGS "" CACHE STRING "Additional flags for firmware target c++ compiler (note: all CMAKE_CXX_FLAGS[_*] are ignored for firmware/bootloader).")
 set(FIRMWARE_CXX_FLAGS_DEBUG "-g" CACHE STRING "Additional flags for firmware target (Debug config) c++ compiler (note: CMAKE_CXX_FLAGS_DEBUG is ignored for firmware/bootloader).")
 
+set(FIRMWARE_C_COMPILER "arm-none-eabi-gcc" CACHE STRING "Specific C compiler for firmware target.")
+set(FIRMWARE_CXX_COMPILER "arm-none-eabi-g++" CACHE STRING "Specific C++ compiler for firmware target.")
+set(FIRMWARE_ASM_COMPILER "arm-none-eabi-as" CACHE STRING "Specific assembler for firmware target.")
+set(FIRMWARE_OBJCOPY "arm-none-eabi-objcopy" CACHE STRING "Specific objcopy for firmware target.")
+set(FIRMWARE_SIZE "arm-none-eabi-size" CACHE STRING "Specific size for firmware target.")
+
 set(THIRDPARTY_DIR thirdparty)
 set(LUA_DIR ${THIRDPARTY_DIR}/Lua/src)
 set(COOS_DIR ${THIRDPARTY_DIR}/CoOS)
@@ -497,9 +503,9 @@ if(NOT MSVC)
 
   if(ARCH STREQUAL ARM)
     enable_language(ASM)
-    set(CMAKE_C_COMPILER arm-none-eabi-gcc)
-    set(CMAKE_CXX_COMPILER arm-none-eabi-g++)
-    set(CMAKE_ASM_COMPILER arm-none-eabi-as)
+    set(CMAKE_C_COMPILER ${FIRMWARE_C_COMPILER})
+    set(CMAKE_CXX_COMPILER ${FIRMWARE_CXX_COMPILER})
+    set(CMAKE_ASM_COMPILER ${FIRMWARE_ASM_COMPILER})
 
     set(CMAKE_SYSTEM_NAME Generic)
     set(CMAKE_SYSTEM_VERSION 1)
@@ -559,7 +565,7 @@ if(NOT MSVC)
 
     add_custom_command(
       TARGET firmware POST_BUILD
-      COMMAND arm-none-eabi-objcopy -O binary firmware.elf firmware.bin
+      COMMAND ${FIRMWARE_OBJCOPY} -O binary firmware.elf firmware.bin
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     )
 
@@ -572,7 +578,7 @@ if(NOT MSVC)
         )
     else()
       add_custom_target(firmware-size
-        COMMAND arm-none-eabi-size -A firmware.elf
+        COMMAND ${FIRMWARE_SIZE} -A firmware.elf
         DEPENDS firmware
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         )
diff --git a/radio/src/debug.h b/radio/src/debug.h
index d6ebcb7a2..04c54c335 100644
--- a/radio/src/debug.h
+++ b/radio/src/debug.h
@@ -51,9 +51,7 @@ uint8_t aux2SerialTracesEnabled();
 #elif defined(DEBUG)
   #define debugPrintf(...) do { serialPrintf(__VA_ARGS__); } while(0)
 #else
-  inline void debugPrintf(const char *, ...)
-  {
-  }
+  #define debugPrintf(...)
 #endif
 
 #define TRACE_TIME_FORMAT     "%0.2f "
diff --git a/radio/src/targets/common/arm/stm32/board_common.h b/radio/src/targets/common/arm/stm32/board_common.h
index dc5f0706f..43a83ac91 100644
--- a/radio/src/targets/common/arm/stm32/board_common.h
+++ b/radio/src/targets/common/arm/stm32/board_common.h
@@ -136,7 +136,7 @@ static inline bool isVBatBridgeEnabled()
 extern "C" {
 #endif
 
-inline uint32_t ticksNow()
+static inline uint32_t ticksNow()
 {
 #if defined(SIMU)
   return 0;