Mirrors_Framework/threadx
1
0
Fork 0
mirror of https://github.com/eclipse-threadx/threadx.git synced 2026-10-06 06:59:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #524 from fdesbiens/fix-pr-277

Browse Source 
Added conditional CMake support for ThreadX SMP
This commit is contained in:
Frédéric Desbiens
2026-04-15 11:11:51 -04:00
committed by GitHub
parent 9dcb05cb78 98e4754381
commit 4f1b9bfdc1
13 changed files with 284 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+21 -3
View File
@@ -11,6 +11,21 @@ endif()
if(NOT DEFINED THREADX_TOOLCHAIN)
message(FATAL_ERROR "Error: THREADX_TOOLCHAIN not defined")
endif()
option(THREADX_SMP "Build ThreadX SMP version" OFF)
if(THREADX_SMP)
set(TX_PORT_DIR "ports_smp")
set(TX_COMMON_DIR "common_smp")
set(TX_ARCH_DIR "${THREADX_ARCH}_smp")
message(STATUS "Building ThreadX SMP version")
else()
set(TX_PORT_DIR "ports")
set(TX_COMMON_DIR "common")
set(TX_ARCH_DIR "${THREADX_ARCH}")
message(STATUS "Building standard ThreadX version")
endif()
message(STATUS "THREADX_ARCH: ${THREADX_ARCH}")
message(STATUS "THREADX_TOOLCHAIN: ${THREADX_TOOLCHAIN}")
@@ -25,11 +40,11 @@ set(CUSTOM_INC_DIR ${CMAKE_CURRENT_BINARY_DIR}/custom_inc)
if(DEFINED THREADX_CUSTOM_PORT)
add_subdirectory(${THREADX_CUSTOM_PORT} threadx_port)
else()
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/ports/${THREADX_ARCH}/${THREADX_TOOLCHAIN})
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${TX_PORT_DIR}/${TX_ARCH_DIR}/${THREADX_TOOLCHAIN})
endif()
# Pick up the common stuff
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/common)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${TX_COMMON_DIR})
# Define the FreeRTOS adaptation layer
add_library(freertos-threadx EXCLUDE_FROM_ALL)
@@ -46,7 +61,7 @@ target_link_libraries(freertos-threadx PUBLIC threadx)
# If the user provided an override, copy it to the custom directory
if (NOT TX_USER_FILE)
message(STATUS "Using default tx_user.h file")
set(TX_USER_FILE ${CMAKE_CURRENT_LIST_DIR}/common/inc/tx_user_sample.h)
set(TX_USER_FILE ${CMAKE_CURRENT_LIST_DIR}/${TX_COMMON_DIR}/inc/tx_user_sample.h)
else()
message(STATUS "Using custom tx_user.h file from ${TX_USER_FILE}")
endif()
@@ -56,6 +71,9 @@ target_include_directories(${PROJECT_NAME}
${CUSTOM_INC_DIR}
)
target_compile_definitions(${PROJECT_NAME} PUBLIC "TX_INCLUDE_USER_DEFINE_FILE" )
if(THREADX_SMP)
target_compile_definitions(${PROJECT_NAME} PUBLIC "TX_MPCORE" )
endif()
# Enable a build target that produces a ZIP file of all sources
set(CPACK_SOURCE_GENERATOR "ZIP")
cmake/cortex_a9.cmake
+13
View File
@@ -0,0 +1,13 @@
# Name of the target
set(CMAKE_SYSTEM_NAME Generic)
set(CMAKE_SYSTEM_PROCESSOR cortex-a9)
set(THREADX_ARCH "cortex_a9")
set(THREADX_TOOLCHAIN "gnu")
set(MCPU_FLAGS "-marm -mcpu=cortex-a9")
set(VFP_FLAGS "")
set(SPEC_FLAGS "--specs=nosys.specs")
# set(LD_FLAGS "-nostartfiles")
include(${CMAKE_CURRENT_LIST_DIR}/arm-none-eabi.cmake)
common_smp/CMakeLists.txt
+218
View File
File diff suppressed because it is too large Load Diff
ports/cortex_a12/gnu/example_build/v7.h
-1
View File
@@ -37,7 +37,6 @@ void disableInterrupts(void);
void invalidateCaches_IS(void);
void cleanInvalidateDCache(void);
void invalidateCaches_IS(void);
void enableCaches(void);
void disableCaches(void);
void invalidateCaches(void);
ports/cortex_a15/gnu/example_build/v7.h
-1
View File
@@ -37,7 +37,6 @@ void disableInterrupts(void);
void invalidateCaches_IS(void);
void cleanInvalidateDCache(void);
void invalidateCaches_IS(void);
void enableCaches(void);
void disableCaches(void);
void invalidateCaches(void);
ports/cortex_a17/gnu/example_build/v7.h
-1
View File
@@ -37,7 +37,6 @@ void disableInterrupts(void);
void invalidateCaches_IS(void);
void cleanInvalidateDCache(void);
void invalidateCaches_IS(void);
void enableCaches(void);
void disableCaches(void);
void invalidateCaches(void);
ports/cortex_a5/gnu/example_build/v7.h
-1
View File
@@ -37,7 +37,6 @@ void disableInterrupts(void);
void invalidateCaches_IS(void);
void cleanInvalidateDCache(void);
void invalidateCaches_IS(void);
void enableCaches(void);
void disableCaches(void);
void invalidateCaches(void);
ports/cortex_a7/gnu/example_build/v7.h
-1
View File
@@ -37,7 +37,6 @@ void disableInterrupts(void);
void invalidateCaches_IS(void);
void cleanInvalidateDCache(void);
void invalidateCaches_IS(void);
void enableCaches(void);
void disableCaches(void);
void invalidateCaches(void);
ports/cortex_a8/gnu/example_build/v7.h
-1
View File
@@ -37,7 +37,6 @@ void disableInterrupts(void);
void invalidateCaches_IS(void);
void cleanInvalidateDCache(void);
void invalidateCaches_IS(void);
void enableCaches(void);
void disableCaches(void);
void invalidateCaches(void);
ports/cortex_a9/gnu/example_build/v7.h
-1
View File
@@ -37,7 +37,6 @@ void disableInterrupts(void);
void invalidateCaches_IS(void);
void cleanInvalidateDCache(void);
void invalidateCaches_IS(void);
void enableCaches(void);
void disableCaches(void);
void invalidateCaches(void);
ports_arch/ARMv7-A/threadx/ports/gnu/example_build/v7.h
-1
View File
@@ -37,7 +37,6 @@ void disableInterrupts(void);
void invalidateCaches_IS(void);
void cleanInvalidateDCache(void);
void invalidateCaches_IS(void);
void enableCaches(void);
void disableCaches(void);
void invalidateCaches(void);
ports_smp/cortex_a9_smp/gnu/CMakeLists.txt
+31
View File
@@ -0,0 +1,31 @@
target_sources(${PROJECT_NAME}
PRIVATE
# {{BEGIN_TARGET_SOURCES}}
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_context_restore.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_context_save.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_interrupt_control.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_interrupt_disable.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_interrupt_restore.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_irq_nesting_end.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_irq_nesting_start.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_schedule.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_core_get.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_core_preempt.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_current_state_get.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_current_thread_get.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_initialize_wait.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_low_level_initialize.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_protect.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_time_get.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_unprotect.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_stack_build.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_system_return.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_vectored_context_save.S
${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_interrupt.S
# {{END_TARGET_SOURCES}}
)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_LIST_DIR}/inc
)
ports_smp/cortex_a9_smp/gnu/example_build/build_threadx_sample.bat
+1 -1
View File
@@ -5,4 +5,4 @@ arm-none-eabi-gcc -c -g -mcpu=cortex-a9 MP_SCU.S
arm-none-eabi-gcc -c -g -mcpu=cortex-a9 MP_Mutexes.S
arm-none-eabi-gcc -c -g -mcpu=cortex-a9 MP_PrivateTimer.S
arm-none-eabi-gcc -c -g -mcpu=cortex-a9 v7.S
arm-none-eabi-gcc -T sample_threadx.ld -e Vectors -o sample_threadx.axf MP_PrivateTimer.o MP_GIC.o MP_Mutexes.o MP_SCU.o sample_threadx.o startup.o v7.o tx.a -Wl,-M > sample_threadx.map
arm-none-eabi-gcc -T sample_threadx.ld -e Vectors -mcpu=cortex-a9 --specs=nosys.specs -o sample_threadx.axf MP_PrivateTimer.o MP_GIC.o MP_Mutexes.o MP_SCU.o sample_threadx.o startup.o v7.o tx.a -Wl,-M > sample_threadx.map