This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 5349a0ebc0c5b92438e3a0b4f84a5258e2cf0b33 Author: zhangyuan29 <[email protected]> AuthorDate: Fri Nov 29 17:39:37 2024 +0800 tricore/cmake: change tc3xx.cmake to chip.cmake rename tc3xx.cmake to chip.cmake Signed-off-by: zhangyuan29 <[email protected]> --- arch/tricore/src/Makefile | 3 +++ arch/tricore/src/cmake/ToolchainGnuc.cmake | 10 ++++------ arch/tricore/src/cmake/ToolchainTasking.cmake | 10 ++++------ arch/tricore/src/cmake/{tc3xx.cmake => chip.cmake} | 14 ++++++++------ 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/arch/tricore/src/Makefile b/arch/tricore/src/Makefile index a36bbb798ea..a9f1080a7c9 100644 --- a/arch/tricore/src/Makefile +++ b/arch/tricore/src/Makefile @@ -26,6 +26,9 @@ include chip/Make.defs ifeq ($(CONFIG_ARCH_CHIP_TC3XX),y) ARCH_SUBDIR = tc3xx include $(ARCH_SUBDIR)/Make.defs +else ifeq ($(CONFIG_ARCH_CHIP_TC4XX),y) +ARCH_SUBDIR = tc4xx +include $(ARCH_SUBDIR)/Make.defs endif ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src diff --git a/arch/tricore/src/cmake/ToolchainGnuc.cmake b/arch/tricore/src/cmake/ToolchainGnuc.cmake index 037bbf7849a..9118f36e937 100644 --- a/arch/tricore/src/cmake/ToolchainGnuc.cmake +++ b/arch/tricore/src/cmake/ToolchainGnuc.cmake @@ -25,15 +25,13 @@ set(CMAKE_SYSTEM_NAME Generic) set(CMAKE_SYSTEM_VERSION 1) -set(ARCH_SUBDIR) - -if(CONFIG_ARCH_CHIP_TC3XX) # TC3XX - set(ARCH_SUBDIR tc3xx) -else() +if(CONFIG_ARCH_CHIP_TC3XX) set(ARCH_SUBDIR tc3xx) +elseif(CONFIG_ARCH_CHIP_TC4XX) + set(ARCH_SUBDIR tc4xx) endif() -include(${ARCH_SUBDIR}) +include(chip.cmake) set(TOOLCHAIN_PREFIX tricore-elf) set(CMAKE_LIBRARY_ARCHITECTURE ${TOOLCHAIN_PREFIX}) diff --git a/arch/tricore/src/cmake/ToolchainTasking.cmake b/arch/tricore/src/cmake/ToolchainTasking.cmake index 38ed165150a..62f2cc24b6d 100644 --- a/arch/tricore/src/cmake/ToolchainTasking.cmake +++ b/arch/tricore/src/cmake/ToolchainTasking.cmake @@ -25,15 +25,13 @@ set(CMAKE_SYSTEM_NAME Generic) set(CMAKE_SYSTEM_VERSION 1) -set(ARCH_SUBDIR) - -if(CONFIG_ARCH_CHIP_TC3XX) # TC3XX - set(ARCH_SUBDIR tc3xx) -else() +if(CONFIG_ARCH_CHIP_TC3XX) set(ARCH_SUBDIR tc3xx) +elseif(CONFIG_ARCH_CHIP_TC4XX) + set(ARCH_SUBDIR tc4xx) endif() -include(${ARCH_SUBDIR}) +include(chip.cmake) set(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}cctc) set(CMAKE_C_COMPILER ${CMAKE_ASM_COMPILER}) diff --git a/arch/tricore/src/cmake/tc3xx.cmake b/arch/tricore/src/cmake/chip.cmake similarity index 81% rename from arch/tricore/src/cmake/tc3xx.cmake rename to arch/tricore/src/cmake/chip.cmake index ebf479ec82d..a9847c3a19a 100644 --- a/arch/tricore/src/cmake/tc3xx.cmake +++ b/arch/tricore/src/cmake/chip.cmake @@ -22,18 +22,20 @@ set(PLATFORM_FLAGS) -if(CONFIG_ARCH_CHIP_TC397) +if(CONFIG_ARCH_CHIP_TC3XX) if(CONFIG_TRICORE_TOOLCHAIN_TASKING) add_compile_options(--cpu=tc39xb) add_link_options(-Ctc39xb) else() list(APPEND PLATFORM_FLAGS -mcpu=tc39xx -mtc162) endif() - list(APPEND PLATFORM_FLAGS - -I${NUTTX_CHIP_ABS_DIR}/tc397/Libraries/iLLD/TC39B/Tricore/Cpu/Std) - list(APPEND PLATFORM_FLAGS - -I${NUTTX_CHIP_ABS_DIR}/tc397/Libraries/Infra/Platform) - list(APPEND PLATFORM_FLAGS -I${NUTTX_CHIP_ABS_DIR}/tc397/Configurations) +elseif(CONFIG_ARCH_CHIP_TC4XX) + if(CONFIG_TRICORE_TOOLCHAIN_TASKING) + add_compile_options(--cpu=tc4DAx) + add_link_options(-Ctc4DAx) + else() + list(APPEND PLATFORM_FLAGS -mcpu=tc4DAx -mtc18) + endif() endif() add_compile_options(${PLATFORM_FLAGS})
