From 46292a9529c52742a02e9acd8d930f56b5276635 Mon Sep 17 00:00:00 2001 From: wangchengdong Date: Fri, 26 Sep 2025 15:40:44 +0800 Subject: [PATCH] arch/tricore: Remove tasking compiler tool specific code from common Cmake scripts Remove tasking compiler tool specific code from common Cmake scripts Signed-off-by: Chengdong Wang --- arch/tricore/src/cmake/ToolchainTasking.cmake | 2 +- cmake/nuttx_generate_outputs.cmake | 28 ++++++++----------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/arch/tricore/src/cmake/ToolchainTasking.cmake b/arch/tricore/src/cmake/ToolchainTasking.cmake index 7b92105d7c..b3ce69b778 100644 --- a/arch/tricore/src/cmake/ToolchainTasking.cmake +++ b/arch/tricore/src/cmake/ToolchainTasking.cmake @@ -39,7 +39,7 @@ set(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}cctc) set(CMAKE_C_COMPILER ${CMAKE_ASM_COMPILER}) set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}cctc) set(CMAKE_STRIP strip --strip-unneeded) -set(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}tricore-elf-objcopy) +set(CMAKE_OBJCOPY echo) set(CMAKE_OBJDUMP ${TOOLCHAIN_PREFIX}elfdump) set(CMAKE_LINKER ${TOOLCHAIN_PREFIX}cctc) diff --git a/cmake/nuttx_generate_outputs.cmake b/cmake/nuttx_generate_outputs.cmake index 729286c651..98b2bb12be 100644 --- a/cmake/nuttx_generate_outputs.cmake +++ b/cmake/nuttx_generate_outputs.cmake @@ -22,26 +22,22 @@ function(nuttx_generate_outputs target) if(CONFIG_INTELHEX_BINARY) - if(NOT CONFIG_ARCH_TOOLCHAIN_TASKING) - add_custom_command( - OUTPUT ${target}.hex - COMMAND ${CMAKE_OBJCOPY} -O ihex ${target} ${target}.hex - DEPENDS ${target}) - add_custom_target(${target}-hex ALL DEPENDS ${target}.hex) - add_dependencies(nuttx_post ${target}-hex) - endif() + add_custom_command( + OUTPUT ${target}.hex + COMMAND ${CMAKE_OBJCOPY} -O ihex ${target} ${target}.hex + DEPENDS ${target}) + add_custom_target(${target}-hex ALL DEPENDS ${target}.hex) + add_dependencies(nuttx_post ${target}-hex) file(APPEND ${CMAKE_BINARY_DIR}/nuttx.manifest "${target}.hex\n") endif() if(CONFIG_MOTOROLA_SREC) - if(NOT CONFIG_ARCH_TOOLCHAIN_TASKING) - add_custom_command( - OUTPUT ${target}.srec - COMMAND ${CMAKE_OBJCOPY} -O srec ${target} ${target}.srec - DEPENDS ${target}) - add_custom_target(${target}-srec ALL DEPENDS ${target}.srec) - add_dependencies(nuttx_post ${target}-srec) - endif() + add_custom_command( + OUTPUT ${target}.srec + COMMAND ${CMAKE_OBJCOPY} -O srec ${target} ${target}.srec + DEPENDS ${target}) + add_custom_target(${target}-srec ALL DEPENDS ${target}.srec) + add_dependencies(nuttx_post ${target}-srec) file(APPEND ${CMAKE_BINARY_DIR}/nuttx.manifest "${target}.srec\n") endif()