Moved FreeRTOS to an object library
This also allows for reducing the propagated includes and thus avoid name clashes to FreeRTOS.
This commit is contained in:
@@ -270,8 +270,6 @@ add_definitions(-DGPS)
|
||||
add_definitions(-DBATTGRAPH -DTHRTRACE)
|
||||
add_definitions(-DSBUS_TRAINER)
|
||||
|
||||
include_directories(${RTOS_DIR}/include)
|
||||
|
||||
foreach(LANGUAGE ${TTS_LANGUAGES})
|
||||
string(TOLOWER ${LANGUAGE} lang_lower)
|
||||
set(SRC ${SRC} translations/tts_${lang_lower}.cpp)
|
||||
@@ -299,22 +297,6 @@ set(FIRMWARE_TARGET_SRC
|
||||
telemetry_driver.cpp
|
||||
)
|
||||
|
||||
set(FIRMWARE_SRC
|
||||
${FIRMWARE_SRC}
|
||||
${RTOS_DIR}/list.c
|
||||
${RTOS_DIR}/queue.c
|
||||
${RTOS_DIR}/tasks.c
|
||||
${RTOS_DIR}/event_groups.c
|
||||
${RTOS_DIR}/timers.c
|
||||
rtos.c)
|
||||
|
||||
if(CLI)
|
||||
set(FIRMWARE_SRC
|
||||
${FIRMWARE_SRC}
|
||||
${RTOS_DIR}/stream_buffer.c)
|
||||
endif()
|
||||
|
||||
|
||||
set(PULSES_SRC
|
||||
${PULSES_SRC}
|
||||
pulses.cpp
|
||||
|
||||
@@ -47,16 +47,36 @@ set(STM32LIB_SRC
|
||||
STM32F2xx_StdPeriph_Driver/src/stm32f2xx_adc.c
|
||||
)
|
||||
|
||||
#
|
||||
# FreeRTOS port specific include
|
||||
#
|
||||
include_directories(${RTOS_DIR}/portable/GCC/ARM_CM3)
|
||||
if(NOT NATIVE_BUILD)
|
||||
#
|
||||
# FreeRTOS port specific include
|
||||
#
|
||||
add_library(freertos OBJECT EXCLUDE_FROM_ALL
|
||||
${RTOS_DIR}/list.c
|
||||
${RTOS_DIR}/queue.c
|
||||
${RTOS_DIR}/tasks.c
|
||||
${RTOS_DIR}/event_groups.c
|
||||
${RTOS_DIR}/timers.c
|
||||
${RTOS_DIR}/stream_buffer.c
|
||||
${RTOS_DIR}/portable/GCC/ARM_CM3/port.c
|
||||
)
|
||||
|
||||
#
|
||||
# System and FreeRTOS port files
|
||||
#
|
||||
set(FIRMWARE_TARGET_SRC ${FIRMWARE_TARGET_SRC}
|
||||
../common/arm/stm32/f2/system_stm32f2xx.c
|
||||
../../${RTOS_DIR}/portable/GCC/ARM_CM3/port.c
|
||||
)
|
||||
target_include_directories(freertos
|
||||
PUBLIC ${RTOS_DIR}/portable/GCC/ARM_CM3
|
||||
PRIVATE ${RTOS_DIR}/include
|
||||
)
|
||||
|
||||
include_directories(${RTOS_DIR}/portable/GCC/ARM_CM3)
|
||||
|
||||
# EdgeTx Compat layer
|
||||
set(FIRMWARE_SRC ${FIRMWARE_SRC} rtos.c)
|
||||
|
||||
#
|
||||
# System and FreeRTOS port files
|
||||
#
|
||||
set(FIRMWARE_SRC ${FIRMWARE_SRC}
|
||||
$<TARGET_OBJECTS:freertos>
|
||||
targets/common/arm/stm32/f2/system_stm32f2xx.c
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -49,16 +49,35 @@ set(STM32LIB_SRC
|
||||
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_adc.c
|
||||
)
|
||||
|
||||
#
|
||||
# FreeRTOS port specific include
|
||||
#
|
||||
include_directories(${RTOS_DIR}/portable/GCC/ARM_CM4F)
|
||||
if(NOT NATIVE_BUILD)
|
||||
#
|
||||
# FreeRTOS port specific include
|
||||
#
|
||||
add_library(freertos OBJECT EXCLUDE_FROM_ALL
|
||||
${RTOS_DIR}/list.c
|
||||
${RTOS_DIR}/queue.c
|
||||
${RTOS_DIR}/tasks.c
|
||||
${RTOS_DIR}/event_groups.c
|
||||
${RTOS_DIR}/timers.c
|
||||
${RTOS_DIR}/stream_buffer.c
|
||||
${RTOS_DIR}/portable/GCC/ARM_CM4F/port.c
|
||||
)
|
||||
|
||||
#
|
||||
# System and FreeRTOS port files
|
||||
#
|
||||
set(FIRMWARE_TARGET_SRC ${FIRMWARE_TARGET_SRC}
|
||||
../common/arm/stm32/f4/system_stm32f4xx.c
|
||||
../../${RTOS_DIR}/portable/GCC/ARM_CM4F/port.c
|
||||
)
|
||||
target_include_directories(freertos
|
||||
PUBLIC ${RTOS_DIR}/portable/GCC/ARM_CM4F
|
||||
PRIVATE ${RTOS_DIR}/include
|
||||
)
|
||||
|
||||
include_directories(${RTOS_DIR}/portable/GCC/ARM_CM4F)
|
||||
|
||||
# EdgeTx Compat layer
|
||||
set(FIRMWARE_SRC ${FIRMWARE_SRC} rtos.c)
|
||||
|
||||
#
|
||||
# System and FreeRTOS port files
|
||||
#
|
||||
set(FIRMWARE_SRC ${FIRMWARE_SRC}
|
||||
$<TARGET_OBJECTS:freertos>
|
||||
targets/common/arm/stm32/f4/system_stm32f4xx.c
|
||||
)
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user