Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

compile fixes

Browse source
This commit is contained in:
Raphael Coeffic 2021-03-22 15:59:13 +01:00
parent 4a3e799f14
commit baea859c8c
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
radio/src/CMakeLists.txt
View file

@ -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 "" 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_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(THIRDPARTY_DIR thirdparty)
set(LUA_DIR ${THIRDPARTY_DIR}/Lua/src) set(LUA_DIR ${THIRDPARTY_DIR}/Lua/src)
set(COOS_DIR ${THIRDPARTY_DIR}/CoOS) set(COOS_DIR ${THIRDPARTY_DIR}/CoOS)
@ -497,9 +503,9 @@ if(NOT MSVC)
if(ARCH STREQUAL ARM) if(ARCH STREQUAL ARM)
enable_language(ASM) enable_language(ASM)
set(CMAKE_C_COMPILER arm-none-eabi-gcc) set(CMAKE_C_COMPILER ${FIRMWARE_C_COMPILER})
set(CMAKE_CXX_COMPILER arm-none-eabi-g++) set(CMAKE_CXX_COMPILER ${FIRMWARE_CXX_COMPILER})
set(CMAKE_ASM_COMPILER arm-none-eabi-as) set(CMAKE_ASM_COMPILER ${FIRMWARE_ASM_COMPILER})
set(CMAKE_SYSTEM_NAME Generic) set(CMAKE_SYSTEM_NAME Generic)
set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_VERSION 1)
@ -559,7 +565,7 @@ if(NOT MSVC)
add_custom_command( add_custom_command(
TARGET firmware POST_BUILD 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} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
) )
@ -572,7 +578,7 @@ if(NOT MSVC)
) )
else() else()
add_custom_target(firmware-size add_custom_target(firmware-size
COMMAND arm-none-eabi-size -A firmware.elf COMMAND ${FIRMWARE_SIZE} -A firmware.elf
DEPENDS firmware DEPENDS firmware
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
) )

4
radio/src/debug.h
View file

@ -51,9 +51,7 @@ uint8_t aux2SerialTracesEnabled();
#elif defined(DEBUG) #elif defined(DEBUG)
#define debugPrintf(...) do { serialPrintf(__VA_ARGS__); } while(0) #define debugPrintf(...) do { serialPrintf(__VA_ARGS__); } while(0)
#else #else
inline void debugPrintf(const char *, ...) #define debugPrintf(...)
{
}
#endif #endif
#define TRACE_TIME_FORMAT "%0.2f " #define TRACE_TIME_FORMAT "%0.2f "

2
radio/src/targets/common/arm/stm32/board_common.h
View file

@ -136,7 +136,7 @@ static inline bool isVBatBridgeEnabled()
extern "C" { extern "C" {
#endif #endif
inline uint32_t ticksNow() static inline uint32_t ticksNow()
{ {
#if defined(SIMU) #if defined(SIMU)
return 0; return 0;