This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new aa5b743e1e9 arch/tricore: use chip family tc3xx/tc4xx as ARCH_CHIP
aa5b743e1e9 is described below
commit aa5b743e1e9089b8a98d496a0218007cfd8abbed
Author: zhangyu117 <[email protected]>
AuthorDate: Thu Oct 8 15:32:19 2026 +0800
arch/tricore: use chip family tc3xx/tc4xx as ARCH_CHIP
Use the chip family (tc3xx/tc4xx) as ARCH_CHIP instead of the single
part name (tc397/tc4da). This commit groups the following changes,
which have to land together to keep the tree buildable:
1. Chip/family layout: make ARCH_CHIP_TC3XX/TC4XX selectable, drop
ARCH_CHIP_TC397/TC4DA and select the concrete part (TC39X/TC4DX)
via a choice in the family Kconfig.
2. Directory merge: merge src/{tc397,tc4da} into src/{tc3xx,tc4xx},
move include/{tc397,tc4da} to include/{tc3xx,tc4xx}, and drop the
ARCH_SUBDIR indirection from CMake and Makefile.
3. Boards: move boards/tricore/{tc397,tc4da} and the related
documentation to {tc3xx,tc4xx}, update defconfigs and board Kconfig.
4. Clock: add CONFIG_CPU_CLOCK_FREQUENCY to replace the iLLD
IFX_CFG_CPU_CLOCK_FREQUENCY in up_perf_init().
5. Toolchain libs: move the TASKING fake libc_fpu stubs to
common/tricore_libc.c and drop the empty libos dummy library.
[skip-cmake-parity]: board scripts/Make.defs are only renamed together
with their boards, both CMake and Make builds are updated.
Signed-off-by: zhangyu117 <[email protected]>
---
.../boards/a2g-tc397-5v-tft/index.rst | 0
.../platforms/tricore/{tc397 => tc3xx}/index.rst | 0
.../boards/triboard_tc4x9_com/index.rst | 0
.../platforms/tricore/{tc4da => tc4xx}/index.rst | 0
arch/tricore/Kconfig | 24 ++----
arch/tricore/include/{tc4da => tc3xx}/chip.h | 8 +-
arch/tricore/include/{tc397 => tc3xx}/irq.h | 8 +-
arch/tricore/include/{tc397 => tc4xx}/chip.h | 8 +-
arch/tricore/include/{tc4da => tc4xx}/irq.h | 8 +-
arch/tricore/src/CMakeLists.txt | 6 +-
arch/tricore/src/Makefile | 10 ---
arch/tricore/src/cmake/gcc.cmake | 6 --
arch/tricore/src/cmake/tasking.cmake | 6 --
arch/tricore/src/common/CMakeLists.txt | 11 +++
arch/tricore/src/common/Make.defs | 16 ++++
arch/tricore/src/common/tricore_initialize.c | 2 +-
.../{tc4xx/tc4xx_libc.c => common/tricore_libc.c} | 2 +-
arch/tricore/src/tc397/.gitignore | 3 -
arch/tricore/src/tc397/CMakeLists.txt | 21 ------
arch/tricore/src/tc397/Kconfig | 5 --
arch/tricore/src/tc397/Make.defs | 21 ------
arch/tricore/src/tc3xx/.gitignore | 1 -
arch/tricore/src/tc3xx/CMakeLists.txt | 8 --
arch/tricore/src/tc3xx/Kconfig | 13 ++++
arch/tricore/src/tc3xx/Make.defs | 22 ------
arch/tricore/src/tc3xx/Toolchain.defs | 2 +-
arch/tricore/src/{tc397 => tc3xx}/chip.h | 8 +-
arch/tricore/src/tc3xx/tc3xx_dummy.c | 29 --------
arch/tricore/src/tc3xx/tc3xx_libc.c | 86 ----------------------
arch/tricore/src/tc4da/CMakeLists.txt | 21 ------
arch/tricore/src/tc4da/Kconfig | 5 --
arch/tricore/src/tc4da/Make.defs | 21 ------
arch/tricore/src/tc4xx/CMakeLists.txt | 8 --
arch/tricore/src/tc4xx/Kconfig | 13 ++++
arch/tricore/src/tc4xx/Make.defs | 22 ------
arch/tricore/src/{tc4da => tc4xx}/chip.h | 8 +-
arch/tricore/src/tc4xx/tc4xx_dummy.c | 29 --------
boards/Kconfig | 6 +-
.../a2g-tc397-5v-tft/CMakeLists.txt | 2 +-
.../{tc397 => tc3xx}/a2g-tc397-5v-tft/Kconfig | 0
.../a2g-tc397-5v-tft/configs/nsh/defconfig | 4 +-
.../a2g-tc397-5v-tft/include/board.h | 8 +-
.../a2g-tc397-5v-tft/include/board_memorymap.h | 8 +-
.../scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel | 2 +-
.../scripts/Lcf_Gnuc_Tricore_Tc.lsl.user | 2 +-
.../scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel | 2 +-
.../scripts/Lcf_Tasking_Tricore_Tc.lsl.user | 2 +-
.../a2g-tc397-5v-tft/scripts/Make.defs | 2 +-
.../a2g-tc397-5v-tft/src/CMakeLists.txt | 2 +-
.../{tc397 => tc3xx}/a2g-tc397-5v-tft/src/Makefile | 2 +-
.../{tc397 => tc3xx}/a2g-tc397-5v-tft/src/tc397.h | 8 +-
.../a2g-tc397-5v-tft/src/tc397_boardinit.c | 2 +-
.../a2g-tc397-5v-tft/src/tc397_bringup.c | 2 +-
.../triboard_tc4x9_com/CMakeLists.txt | 2 +-
.../{tc4da => tc4xx}/triboard_tc4x9_com/Kconfig | 0
.../triboard_tc4x9_com/configs/nsh/defconfig | 4 +-
.../triboard_tc4x9_com/include/board.h | 8 +-
.../triboard_tc4x9_com/include/board_memorymap.h | 8 +-
.../scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel | 2 +-
.../scripts/Lcf_Gnuc_Tricore_Tc.lsl.user | 2 +-
.../scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel | 2 +-
.../scripts/Lcf_Tasking_Tricore_Tc.lsl.user | 2 +-
.../triboard_tc4x9_com/scripts/Make.defs | 2 +-
.../triboard_tc4x9_com/src/CMakeLists.txt | 2 +-
.../triboard_tc4x9_com/src/Makefile | 2 +-
.../triboard_tc4x9_com/src/tc4da.h | 8 +-
.../triboard_tc4x9_com/src/tc4da_boardinit.c | 2 +-
.../triboard_tc4x9_com/src/tc4da_bringup.c | 2 +-
68 files changed, 139 insertions(+), 424 deletions(-)
diff --git
a/Documentation/platforms/tricore/tc397/boards/a2g-tc397-5v-tft/index.rst
b/Documentation/platforms/tricore/tc3xx/boards/a2g-tc397-5v-tft/index.rst
similarity index 100%
rename from
Documentation/platforms/tricore/tc397/boards/a2g-tc397-5v-tft/index.rst
rename to
Documentation/platforms/tricore/tc3xx/boards/a2g-tc397-5v-tft/index.rst
diff --git a/Documentation/platforms/tricore/tc397/index.rst
b/Documentation/platforms/tricore/tc3xx/index.rst
similarity index 100%
rename from Documentation/platforms/tricore/tc397/index.rst
rename to Documentation/platforms/tricore/tc3xx/index.rst
diff --git
a/Documentation/platforms/tricore/tc4da/boards/triboard_tc4x9_com/index.rst
b/Documentation/platforms/tricore/tc4xx/boards/triboard_tc4x9_com/index.rst
similarity index 100%
rename from
Documentation/platforms/tricore/tc4da/boards/triboard_tc4x9_com/index.rst
rename to
Documentation/platforms/tricore/tc4xx/boards/triboard_tc4x9_com/index.rst
diff --git a/Documentation/platforms/tricore/tc4da/index.rst
b/Documentation/platforms/tricore/tc4xx/index.rst
similarity index 100%
rename from Documentation/platforms/tricore/tc4da/index.rst
rename to Documentation/platforms/tricore/tc4xx/index.rst
diff --git a/arch/tricore/Kconfig b/arch/tricore/Kconfig
index 3588128b7df..ad5cbf972df 100644
--- a/arch/tricore/Kconfig
+++ b/arch/tricore/Kconfig
@@ -56,7 +56,7 @@ config ARCH_FAMILY
default "tc1v8" if ARCH_TC1V8
config ARCH_CHIP_TC3XX
- bool
+ bool "infineon aurix tc3xx"
select ARCH_TC1V6
select ARCH_HAVE_ADDRENV
select ARCH_HAVE_I2CRESET
@@ -69,7 +69,7 @@ config ARCH_CHIP_TC3XX
Infineon aurix tc3xx (six cores)
config ARCH_CHIP_TC4XX
- bool
+ bool "infineon aurix tc4xx"
select ARCH_TC1V8
select ARCH_HAVE_ADDRENV
select ARCH_HAVE_FPU if !TRICORE_CSRM
@@ -83,18 +83,10 @@ config ARCH_CHIP_TC4XX
---help---
Infineon aurix tc4xx (six cores and one security core)
-config ARCH_CHIP_TC397
- bool "AURIX CHIP TC397"
- select ARCH_CHIP_TC3XX
-
-config ARCH_CHIP_TC4DA
- bool "AURIX CHIP TC4DA"
- select ARCH_CHIP_TC4XX
-
config ARCH_CHIP
string
- default "tc397" if ARCH_CHIP_TC397
- default "tc4da" if ARCH_CHIP_TC4DA
+ default "tc3xx" if ARCH_CHIP_TC3XX
+ default "tc4xx" if ARCH_CHIP_TC4XX
config ARCH_DCACHE_ADDR
hex "AURIX Dcache base address"
@@ -134,13 +126,9 @@ config CPU_COREID
if ARCH_CHIP_TC3XX
source "arch/tricore/src/tc3xx/Kconfig"
endif
+
if ARCH_CHIP_TC4XX
source "arch/tricore/src/tc4xx/Kconfig"
endif
-if ARCH_CHIP_TC397
-source "arch/tricore/src/tc397/Kconfig"
-endif
-if ARCH_CHIP_TC4DA
-source "arch/tricore/src/tc4da/Kconfig"
-endif
+
endif # ARCH_TRICORE
diff --git a/arch/tricore/include/tc4da/chip.h
b/arch/tricore/include/tc3xx/chip.h
similarity index 91%
rename from arch/tricore/include/tc4da/chip.h
rename to arch/tricore/include/tc3xx/chip.h
index f063fabbe5d..1fa1dbfdd71 100644
--- a/arch/tricore/include/tc4da/chip.h
+++ b/arch/tricore/include/tc3xx/chip.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/tricore/include/tc4da/chip.h
+ * arch/tricore/include/tc3xx/chip.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,8 +20,8 @@
*
****************************************************************************/
-#ifndef __ARCH_TRICORE_INCLUDE_TC4DA_CHIP_H
-#define __ARCH_TRICORE_INCLUDE_TC4DA_CHIP_H
+#ifndef __ARCH_TRICORE_INCLUDE_TC3XX_CHIP_H
+#define __ARCH_TRICORE_INCLUDE_TC3XX_CHIP_H
/****************************************************************************
* Included Files
@@ -45,4 +45,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_TRICORE_INCLUDE_TC4DA_CHIP_H */
+#endif /* __ARCH_TRICORE_INCLUDE_TC3XX_CHIP_H */
diff --git a/arch/tricore/include/tc397/irq.h b/arch/tricore/include/tc3xx/irq.h
similarity index 93%
rename from arch/tricore/include/tc397/irq.h
rename to arch/tricore/include/tc3xx/irq.h
index ae3641cb0e3..155e0620780 100644
--- a/arch/tricore/include/tc397/irq.h
+++ b/arch/tricore/include/tc3xx/irq.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/tricore/include/tc397/irq.h
+ * arch/tricore/include/tc3xx/irq.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -24,8 +24,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_TRICORE_INCLUDE_TC397_IRQ_H
-#define __ARCH_TRICORE_INCLUDE_TC397_IRQ_H
+#ifndef __ARCH_TRICORE_INCLUDE_TC3XX_IRQ_H
+#define __ARCH_TRICORE_INCLUDE_TC3XX_IRQ_H
/****************************************************************************
* Included Files
@@ -64,4 +64,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_TRICORE_INCLUDE_TC397_IRQ_H */
+#endif /* __ARCH_TRICORE_INCLUDE_TC3XX_IRQ_H */
diff --git a/arch/tricore/include/tc397/chip.h
b/arch/tricore/include/tc4xx/chip.h
similarity index 91%
rename from arch/tricore/include/tc397/chip.h
rename to arch/tricore/include/tc4xx/chip.h
index b2106bf7106..07cec254715 100644
--- a/arch/tricore/include/tc397/chip.h
+++ b/arch/tricore/include/tc4xx/chip.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/tricore/include/tc397/chip.h
+ * arch/tricore/include/tc4xx/chip.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,8 +20,8 @@
*
****************************************************************************/
-#ifndef __ARCH_TRICORE_INCLUDE_TC397_CHIP_H
-#define __ARCH_TRICORE_INCLUDE_TC397_CHIP_H
+#ifndef __ARCH_TRICORE_INCLUDE_TC4XX_CHIP_H
+#define __ARCH_TRICORE_INCLUDE_TC4XX_CHIP_H
/****************************************************************************
* Included Files
@@ -45,4 +45,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_TRICORE_INCLUDE_TC397_CHIP_H */
+#endif /* __ARCH_TRICORE_INCLUDE_TC4XX_CHIP_H */
diff --git a/arch/tricore/include/tc4da/irq.h b/arch/tricore/include/tc4xx/irq.h
similarity index 93%
rename from arch/tricore/include/tc4da/irq.h
rename to arch/tricore/include/tc4xx/irq.h
index 5cf6aa22987..0204d07586e 100644
--- a/arch/tricore/include/tc4da/irq.h
+++ b/arch/tricore/include/tc4xx/irq.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/tricore/include/tc4da/irq.h
+ * arch/tricore/include/tc4xx/irq.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -24,8 +24,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_TRICORE_INCLUDE_TC4DA_IRQ_H
-#define __ARCH_TRICORE_INCLUDE_TC4DA_IRQ_H
+#ifndef __ARCH_TRICORE_INCLUDE_TC4XX_IRQ_H
+#define __ARCH_TRICORE_INCLUDE_TC4XX_IRQ_H
/****************************************************************************
* Included Files
@@ -64,4 +64,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_TRICORE_INCLUDE_TC4DA_IRQ_H */
+#endif /* __ARCH_TRICORE_INCLUDE_TC4XX_IRQ_H */
diff --git a/arch/tricore/src/CMakeLists.txt b/arch/tricore/src/CMakeLists.txt
index a41ca24b43f..c14ed13eecb 100644
--- a/arch/tricore/src/CMakeLists.txt
+++ b/arch/tricore/src/CMakeLists.txt
@@ -20,16 +20,14 @@
#
#
##############################################################################
-add_subdirectory(${ARCH_SUBDIR})
add_subdirectory(${NUTTX_CHIP_ABS_DIR} exclude_chip EXCLUDE_FROM_ALL)
add_subdirectory(common)
# Include directories (before system ones) as PUBLIC so that it can be exposed
# to libboard
-target_include_directories(arch BEFORE PUBLIC ${NUTTX_CHIP_ABS_DIR} common
- ${ARCH_SUBDIR})
+target_include_directories(arch BEFORE PUBLIC ${NUTTX_CHIP_ABS_DIR} common)
if(NOT CONFIG_BUILD_FLAT)
target_include_directories(arch_interface BEFORE PUBLIC ${NUTTX_CHIP_ABS_DIR}
- common
${ARCH_SUBDIR})
+ common)
endif()
diff --git a/arch/tricore/src/Makefile b/arch/tricore/src/Makefile
index 3e28447cbfb..dc4265db037 100644
--- a/arch/tricore/src/Makefile
+++ b/arch/tricore/src/Makefile
@@ -24,19 +24,10 @@ include $(TOPDIR)/Make.defs
include chip/Make.defs
include common/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
INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
-INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)
INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES)
@@ -133,7 +124,6 @@ endif
VPATH += chip
VPATH += common
-VPATH += $(ARCH_SUBDIR)
all: $(HEAD_COBJ) $(BIN)
diff --git a/arch/tricore/src/cmake/gcc.cmake b/arch/tricore/src/cmake/gcc.cmake
index 91897f597db..bd3530413aa 100644
--- a/arch/tricore/src/cmake/gcc.cmake
+++ b/arch/tricore/src/cmake/gcc.cmake
@@ -25,12 +25,6 @@
set(CMAKE_SYSTEM_NAME Generic)
set(CMAKE_SYSTEM_VERSION 1)
-if(CONFIG_ARCH_CHIP_TC3XX)
- set(ARCH_SUBDIR tc3xx)
-elseif(CONFIG_ARCH_CHIP_TC4XX)
- set(ARCH_SUBDIR tc4xx)
-endif()
-
include(${CMAKE_CURRENT_LIST_DIR}/chip.cmake)
set(TOOLCHAIN_PREFIX tricore-elf)
diff --git a/arch/tricore/src/cmake/tasking.cmake
b/arch/tricore/src/cmake/tasking.cmake
index 550fc2d2fb3..8103c11e92f 100644
--- a/arch/tricore/src/cmake/tasking.cmake
+++ b/arch/tricore/src/cmake/tasking.cmake
@@ -25,12 +25,6 @@
set(CMAKE_SYSTEM_NAME Generic)
set(CMAKE_SYSTEM_VERSION 1)
-if(CONFIG_ARCH_CHIP_TC3XX)
- set(ARCH_SUBDIR tc3xx)
-elseif(CONFIG_ARCH_CHIP_TC4XX)
- set(ARCH_SUBDIR tc4xx)
-endif()
-
include(chip.cmake)
set(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}cctc)
diff --git a/arch/tricore/src/common/CMakeLists.txt
b/arch/tricore/src/common/CMakeLists.txt
index c82566891d5..6b135462282 100644
--- a/arch/tricore/src/common/CMakeLists.txt
+++ b/arch/tricore/src/common/CMakeLists.txt
@@ -74,3 +74,14 @@ target_compile_options(nuttx PRIVATE ${IFXFLAGS})
target_include_directories(
nuttx SYSTEM PRIVATE ${NUTTX_DIR}/include ${NUTTX_BINARY_DIR}/include
${NUTTX_BINARY_DIR}/include_arch)
+
+# TASKING toolchain: build a fake libc_fpu.a to override the toolchain's
default
+# C library and provide stubs for the symbols the linker still references (see
+# tricore_libc.c for details).
+
+if(CONFIG_TRICORE_TOOLCHAIN_TASKING)
+ nuttx_add_kernel_library(c_fpu)
+ target_sources(c_fpu PRIVATE tricore_libc.c)
+ target_link_options(nuttx PRIVATE
+ --library-directory=${CMAKE_CURRENT_BINARY_DIR})
+endif()
diff --git a/arch/tricore/src/common/Make.defs
b/arch/tricore/src/common/Make.defs
index 8431442beba..c33e722c6b3 100644
--- a/arch/tricore/src/common/Make.defs
+++ b/arch/tricore/src/common/Make.defs
@@ -68,3 +68,19 @@ endif
CFLAGS += -DIFX_CFG_EXTEND_TRAP_HOOKS
CFLAGS += -DIFX_USE_SW_MANAGED_INT
+
+# TASKING toolchain: build a fake libc_fpu.a to override the toolchain's
+# default C library and provide stubs for the symbols the linker still
+# references (see tricore_libc.c for details).
+
+ifeq ($(CONFIG_TRICORE_TOOLCHAIN_TASKING),y)
+
+tricore_libc$(OBJEXT): tricore_libc.c
+ $(call COMPILE, $<, $@)
+
+libc_fpu$(LIBEXT): tricore_libc$(OBJEXT)
+ $(call ARCHIVE, $@, $<)
+
+EXTRA_LIBS += libc_fpu$(LIBEXT)
+
+endif
diff --git a/arch/tricore/src/common/tricore_initialize.c
b/arch/tricore/src/common/tricore_initialize.c
index 86880f2c3a2..53edb23aa78 100644
--- a/arch/tricore/src/common/tricore_initialize.c
+++ b/arch/tricore/src/common/tricore_initialize.c
@@ -63,7 +63,7 @@ volatile bool g_interrupt_context[CONFIG_SMP_NCPUS];
void up_initialize(void)
{
#ifdef CONFIG_ARCH_PERF_EVENTS
- up_perf_init((void *)IFX_CFG_CPU_CLOCK_FREQUENCY);
+ up_perf_init((void *)CONFIG_CPU_CLOCK_FREQUENCY);
#endif
tricore_trapinit();
diff --git a/arch/tricore/src/tc4xx/tc4xx_libc.c
b/arch/tricore/src/common/tricore_libc.c
similarity index 98%
rename from arch/tricore/src/tc4xx/tc4xx_libc.c
rename to arch/tricore/src/common/tricore_libc.c
index ba1138e7f84..5944b15167f 100644
--- a/arch/tricore/src/tc4xx/tc4xx_libc.c
+++ b/arch/tricore/src/common/tricore_libc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/tricore/src/tc4xx/tc4xx_libc.c
+ * arch/tricore/src/common/tricore_libc.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/arch/tricore/src/tc397/.gitignore
b/arch/tricore/src/tc397/.gitignore
deleted file mode 100644
index 6e279e3dd9a..00000000000
--- a/arch/tricore/src/tc397/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*_unpack
-/tc397
-/*tar.gz
diff --git a/arch/tricore/src/tc397/CMakeLists.txt
b/arch/tricore/src/tc397/CMakeLists.txt
deleted file mode 100644
index 90bed2ddc60..00000000000
--- a/arch/tricore/src/tc397/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-#
##############################################################################
-# arch/tricore/src/tc397/CMakeLists.txt
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
-# license agreements. See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership. The ASF licenses this
-# file to you under the Apache License, Version 2.0 (the "License"); you may
not
-# use this file except in compliance with the License. You may obtain a copy
of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-#
-#
##############################################################################
diff --git a/arch/tricore/src/tc397/Kconfig b/arch/tricore/src/tc397/Kconfig
deleted file mode 100644
index 18c7905aed7..00000000000
--- a/arch/tricore/src/tc397/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
diff --git a/arch/tricore/src/tc397/Make.defs b/arch/tricore/src/tc397/Make.defs
deleted file mode 100644
index 79e00f2bc27..00000000000
--- a/arch/tricore/src/tc397/Make.defs
+++ /dev/null
@@ -1,21 +0,0 @@
-############################################################################
-# arch/tricore/src/tc397/Make.defs
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership. The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
diff --git a/arch/tricore/src/tc3xx/.gitignore
b/arch/tricore/src/tc3xx/.gitignore
index 6e279e3dd9a..c4eae5e95df 100644
--- a/arch/tricore/src/tc3xx/.gitignore
+++ b/arch/tricore/src/tc3xx/.gitignore
@@ -1,3 +1,2 @@
/*_unpack
-/tc397
/*tar.gz
diff --git a/arch/tricore/src/tc3xx/CMakeLists.txt
b/arch/tricore/src/tc3xx/CMakeLists.txt
index 385ed34b156..9b30dd1683e 100644
--- a/arch/tricore/src/tc3xx/CMakeLists.txt
+++ b/arch/tricore/src/tc3xx/CMakeLists.txt
@@ -24,14 +24,6 @@ set(SRCS tc3xx_timerisr.c tc3xx_serial.c)
target_sources(arch PRIVATE ${SRCS})
-if(CONFIG_TRICORE_TOOLCHAIN_TASKING)
- nuttx_add_kernel_library(c_fpu)
- target_sources(c_fpu PRIVATE tc3xx_libc.c)
- target_link_options(
- nuttx PRIVATE
- --library-directory=${NUTTX_BINARY_DIR}/arch/tricore/src/exclude_chip)
-endif()
-
set(ILLD_UNPACK "${CMAKE_CURRENT_SOURCE_DIR}/../illd/tc3xx")
set(ILLD_TARBALL "${ILLD_UNPACK}/illd.tar.gz")
set(ILLD_UNPACK_NAME "illd_release_tc3x-main")
diff --git a/arch/tricore/src/tc3xx/Kconfig b/arch/tricore/src/tc3xx/Kconfig
index 1c3f45744d0..5886f390d3a 100644
--- a/arch/tricore/src/tc3xx/Kconfig
+++ b/arch/tricore/src/tc3xx/Kconfig
@@ -3,8 +3,21 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
+choice
+ prompt "TC3XX Chip Selection"
+ default ARCH_CHIP_TC39X
+
+config ARCH_CHIP_TC39X
+ bool "TC3XX TC39X"
+
+endchoice
+
comment "TC3XX Configuration Options"
+config CPU_CLOCK_FREQUENCY
+ int "CPU clock frequency (Hz)"
+ default 300000000
+
menu "TC3XX Peripheral Support"
# These are the peripheral selections proper
diff --git a/arch/tricore/src/tc3xx/Make.defs b/arch/tricore/src/tc3xx/Make.defs
index 124d8cf6447..265035983c4 100644
--- a/arch/tricore/src/tc3xx/Make.defs
+++ b/arch/tricore/src/tc3xx/Make.defs
@@ -25,28 +25,6 @@ CHIP_CSRCS += tc3xx_serial.c
VPATH += tc3xx
-ifeq ($(CONFIG_TRICORE_TOOLCHAIN_TASKING),y)
-
-tc3xx_libc$(OBJEXT): tc3xx_libc.c
- $(call COMPILE, $<, $@)
-
-libc_fpu$(LIBEXT): tc3xx_libc$(OBJEXT)
- $(call ARCHIVE, $@, $<)
-
-EXTRA_LIBS += libc_fpu$(LIBEXT)
-
-else
-
-tc3xx_dummy$(OBJEXT): tc3xx_dummy.c
- $(call COMPILE, $<, $@)
-
-libos$(LIBEXT): tc3xx_dummy$(OBJEXT)
- $(call ARCHIVE, $@, $<)
-
-EXTRA_LIBS += libos$(LIBEXT)
-
-endif
-
ILLD_UNPACK = illd/tc3xx
ILLD_TARBALL = $(ILLD_UNPACK)/illd.tar.gz
ILLD_UNPACK_NAME = illd_release_tc3x-main
diff --git a/arch/tricore/src/tc3xx/Toolchain.defs
b/arch/tricore/src/tc3xx/Toolchain.defs
index ee16fc33bdf..443bbc0970f 100644
--- a/arch/tricore/src/tc3xx/Toolchain.defs
+++ b/arch/tricore/src/tc3xx/Toolchain.defs
@@ -20,7 +20,7 @@
#
############################################################################
-ifeq ($(CONFIG_ARCH_CHIP_TC397),y)
+ifeq ($(CONFIG_ARCH_CHIP_TC39X),y)
ifeq ($(CONFIG_TRICORE_TOOLCHAIN_TASKING),y)
ARCHCPUFLAGS += --cpu=tc39xb
LDFLAGS += -Ctc39xb
diff --git a/arch/tricore/src/tc397/chip.h b/arch/tricore/src/tc3xx/chip.h
similarity index 89%
rename from arch/tricore/src/tc397/chip.h
rename to arch/tricore/src/tc3xx/chip.h
index 1521ff42374..5ffe3875d6a 100644
--- a/arch/tricore/src/tc397/chip.h
+++ b/arch/tricore/src/tc3xx/chip.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/tricore/src/tc397/chip.h
+ * arch/tricore/src/tc3xx/chip.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,8 +20,8 @@
*
****************************************************************************/
-#ifndef __ARCH_TRICORE_SRC_TC397_CHIP_H
-#define __ARCH_TRICORE_SRC_TC397_CHIP_H
+#ifndef __ARCH_TRICORE_SRC_TC3XX_CHIP_H
+#define __ARCH_TRICORE_SRC_TC3XX_CHIP_H
/****************************************************************************
* Included Files
@@ -30,4 +30,4 @@
#define UART_PIN_RX IfxAsclin0_RXA_P14_1_IN /* UART receive port pin */
#define UART_PIN_TX IfxAsclin0_TX_P14_0_OUT /* UART transmit port pin */
-#endif /* __ARCH_TRICORE_SRC_TC397_CHIP_H */
+#endif /* __ARCH_TRICORE_SRC_TC3XX_CHIP_H */
diff --git a/arch/tricore/src/tc3xx/tc3xx_dummy.c
b/arch/tricore/src/tc3xx/tc3xx_dummy.c
deleted file mode 100644
index 8375101e279..00000000000
--- a/arch/tricore/src/tc3xx/tc3xx_dummy.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/****************************************************************************
- * arch/tricore/src/tc3xx/tc3xx_dummy.c
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
diff --git a/arch/tricore/src/tc3xx/tc3xx_libc.c
b/arch/tricore/src/tc3xx/tc3xx_libc.c
deleted file mode 100644
index 4e55d90c5ed..00000000000
--- a/arch/tricore/src/tc3xx/tc3xx_libc.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
- * arch/tricore/src/tc3xx/tc3xx_libc.c
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <stdint.h>
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/* TODO:
- * The data copy from flash to ram reuses the implementation in tricore sdk.
- * The next update will reimplement _c_init() to abandon the copy code.
- *
- * Usage: ltc [options] files
- * -i --user-provided-initialization-code
- *
- * the user provides his own initialization
- * routine, do not emit the copytable
- *
- * void _c_init(void)
- * {
- * }
- */
-
-/* The implementation of libc is introduced by default in the Tricore
- * toolchain, in nuttx we made a fake libc_fpu.a library to bypass
- * this issue, but the linker will still generate markup code,
- * add a few definitions to fool the linker.
- */
-
-void __printf_float(void)
-{
-}
-
-void __printf_int(void)
-{
-}
-
-void __printf_llong(void)
-{
-}
-
-void _main(void)
-{
-}
-
-void _doexit(void)
-{
-}
-
-/* BUG, Workaround for tasking compiler:
- *
- * ltc E106: unresolved external: regulator_gpio_init -
- * (drivers_initialize.o)
- * ltc F019: unrecoverable error: fatal link error
- *
- */
-
-int regulator_gpio_init(void *iodev, void *desc)
-{
- return 0;
-}
diff --git a/arch/tricore/src/tc4da/CMakeLists.txt
b/arch/tricore/src/tc4da/CMakeLists.txt
deleted file mode 100644
index 869adb877b1..00000000000
--- a/arch/tricore/src/tc4da/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-#
##############################################################################
-# arch/tricore/src/tc4da/CMakeLists.txt
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
-# license agreements. See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership. The ASF licenses this
-# file to you under the Apache License, Version 2.0 (the "License"); you may
not
-# use this file except in compliance with the License. You may obtain a copy
of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-#
-#
##############################################################################
diff --git a/arch/tricore/src/tc4da/Kconfig b/arch/tricore/src/tc4da/Kconfig
deleted file mode 100644
index 18c7905aed7..00000000000
--- a/arch/tricore/src/tc4da/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
diff --git a/arch/tricore/src/tc4da/Make.defs b/arch/tricore/src/tc4da/Make.defs
deleted file mode 100644
index fd041dcf882..00000000000
--- a/arch/tricore/src/tc4da/Make.defs
+++ /dev/null
@@ -1,21 +0,0 @@
-############################################################################
-# arch/tricore/src/tc4da/Make.defs
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership. The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
diff --git a/arch/tricore/src/tc4xx/CMakeLists.txt
b/arch/tricore/src/tc4xx/CMakeLists.txt
index 2c21d86d77a..c25f2d8ebca 100644
--- a/arch/tricore/src/tc4xx/CMakeLists.txt
+++ b/arch/tricore/src/tc4xx/CMakeLists.txt
@@ -24,14 +24,6 @@ set(SRCS tc4xx_timerisr.c tc4xx_serial.c)
target_sources(arch PRIVATE ${SRCS})
-if(CONFIG_TRICORE_TOOLCHAIN_TASKING)
- nuttx_add_kernel_library(c_fpu)
- target_sources(c_fpu PRIVATE tc4xx_libc.c)
- target_link_options(
- nuttx PRIVATE
- --library-directory=${NUTTX_BINARY_DIR}/arch/tricore/src/exclude_chip)
-endif()
-
set(ILLD_UNPACK "${CMAKE_CURRENT_SOURCE_DIR}/../illd/tc4xx")
set(ILLD_TARBALL "${ILLD_UNPACK}/illd.tar.gz")
set(ILLD_UNPACK_NAME "illd_release_tc4x-main")
diff --git a/arch/tricore/src/tc4xx/Kconfig b/arch/tricore/src/tc4xx/Kconfig
index dfe17717c53..00cccf5b83b 100644
--- a/arch/tricore/src/tc4xx/Kconfig
+++ b/arch/tricore/src/tc4xx/Kconfig
@@ -3,8 +3,21 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
+choice
+ prompt "TC4XX Chip Selection"
+ default ARCH_CHIP_TC4DX
+
+config ARCH_CHIP_TC4DX
+ bool "TC4XX TC4DX"
+
+endchoice
+
comment "TC4XX Configuration Options"
+config CPU_CLOCK_FREQUENCY
+ int "CPU clock frequency (Hz)"
+ default 500000000
+
menu "TC4XX Peripheral Support"
# These are the peripheral selections proper
diff --git a/arch/tricore/src/tc4xx/Make.defs b/arch/tricore/src/tc4xx/Make.defs
index 7df4ec01e92..5a3601f79a9 100644
--- a/arch/tricore/src/tc4xx/Make.defs
+++ b/arch/tricore/src/tc4xx/Make.defs
@@ -25,28 +25,6 @@ CHIP_CSRCS += tc4xx_serial.c
VPATH += tc4xx
-ifeq ($(CONFIG_TRICORE_TOOLCHAIN_TASKING),y)
-
-tc4xx_libc$(OBJEXT): tc4xx_libc.c
- $(call COMPILE, $<, $@)
-
-libc_fpu$(LIBEXT): tc4xx_libc$(OBJEXT)
- $(call ARCHIVE, $@, $<)
-
-EXTRA_LIBS += libc_fpu$(LIBEXT)
-
-else
-
-tc4xx_dummy$(OBJEXT): tc4xx_dummy.c
- $(call COMPILE, $<, $@)
-
-libos$(LIBEXT): tc4xx_dummy$(OBJEXT)
- $(call ARCHIVE, $@, $<)
-
-EXTRA_LIBS += libos$(LIBEXT)
-
-endif
-
ILLD_UNPACK = illd/tc4xx
ILLD_TARBALL = $(ILLD_UNPACK)/illd.tar.gz
ILLD_UNPACK_NAME = illd_release_tc4x-main
diff --git a/arch/tricore/src/tc4da/chip.h b/arch/tricore/src/tc4xx/chip.h
similarity index 89%
rename from arch/tricore/src/tc4da/chip.h
rename to arch/tricore/src/tc4xx/chip.h
index 89f26c2d667..7d3d255ad69 100644
--- a/arch/tricore/src/tc4da/chip.h
+++ b/arch/tricore/src/tc4xx/chip.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/tricore/src/tc4da/chip.h
+ * arch/tricore/src/tc4xx/chip.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,8 +20,8 @@
*
****************************************************************************/
-#ifndef __ARCH_TRICORE_SRC_TC4DA_CHIP_H
-#define __ARCH_TRICORE_SRC_TC4DA_CHIP_H
+#ifndef __ARCH_TRICORE_SRC_TC4XX_CHIP_H
+#define __ARCH_TRICORE_SRC_TC4XX_CHIP_H
/****************************************************************************
* Included Files
@@ -30,4 +30,4 @@
#define UART_PIN_RX IfxAsclin0_RXA_F_P14_1_IN /* UART receive port pin */
#define UART_PIN_TX IfxAsclin0_TX_F_P14_0_OUT /* UART transmit port pin */
-#endif /* __ARCH_TRICORE_SRC_TC4DA_CHIP_H */
+#endif /* __ARCH_TRICORE_SRC_TC4XX_CHIP_H */
diff --git a/arch/tricore/src/tc4xx/tc4xx_dummy.c
b/arch/tricore/src/tc4xx/tc4xx_dummy.c
deleted file mode 100644
index 720c66095fe..00000000000
--- a/arch/tricore/src/tc4xx/tc4xx_dummy.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/****************************************************************************
- * arch/tricore/src/tc4xx/tc4xx_dummy.c
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
diff --git a/boards/Kconfig b/boards/Kconfig
index 52450277701..42fdfde24f4 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -2821,14 +2821,14 @@ config ARCH_BOARD_SABRE_6QUAD
config ARCH_BOARD_A2G_TC397_5V_TFT
bool "Infineon's AURIX TC397 board: KIT_A2G_TC397_5V_TFT"
- depends on ARCH_CHIP_TC397
+ depends on ARCH_CHIP_TC39X
---help---
This options selects support for NuttX on the Infineon's AURIX
board
board featuring the TC397 6Quad CPU.
config ARCH_BOARD_TRIBOARD_TC4X9_COM
bool "Infineon's AURIX TC4DA board: TRIBOARD_TC4X9_COM"
- depends on ARCH_CHIP_TC4DA
+ depends on ARCH_CHIP_TC4DX
---help---
This options selects support for NuttX on the Infineon's AURIX
board
board featuring the TC4DA 6Quad CPU.
@@ -4635,7 +4635,7 @@ if ARCH_BOARD_SABRE_6QUAD
source "boards/arm/imx6/sabre-6quad/Kconfig"
endif
if ARCH_BOARD_A2G_TC397_5V_TFT
-source "boards/tricore/tc397/a2g-tc397-5v-tft/Kconfig"
+source "boards/tricore/tc3xx/a2g-tc397-5v-tft/Kconfig"
endif
if ARCH_BOARD_MPS2_AN500
source "boards/arm/mps/mps2-an500/Kconfig"
diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/CMakeLists.txt
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/CMakeLists.txt
similarity index 94%
rename from boards/tricore/tc397/a2g-tc397-5v-tft/CMakeLists.txt
rename to boards/tricore/tc3xx/a2g-tc397-5v-tft/CMakeLists.txt
index dea61821ca7..2a4959d2538 100644
--- a/boards/tricore/tc397/a2g-tc397-5v-tft/CMakeLists.txt
+++ b/boards/tricore/tc3xx/a2g-tc397-5v-tft/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# boards/tricore/tc397/a2g-tc397-5v-tft/CMakeLists.txt
+# boards/tricore/tc3xx/a2g-tc397-5v-tft/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/Kconfig
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/Kconfig
similarity index 100%
rename from boards/tricore/tc397/a2g-tc397-5v-tft/Kconfig
rename to boards/tricore/tc3xx/a2g-tc397-5v-tft/Kconfig
diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/configs/nsh/defconfig
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/configs/nsh/defconfig
similarity index 96%
rename from boards/tricore/tc397/a2g-tc397-5v-tft/configs/nsh/defconfig
rename to boards/tricore/tc3xx/a2g-tc397-5v-tft/configs/nsh/defconfig
index fe5e74cabec..1f3d35cedfc 100644
--- a/boards/tricore/tc397/a2g-tc397-5v-tft/configs/nsh/defconfig
+++ b/boards/tricore/tc3xx/a2g-tc397-5v-tft/configs/nsh/defconfig
@@ -9,8 +9,8 @@
CONFIG_ARCH="tricore"
CONFIG_ARCH_BOARD="a2g-tc397-5v-tft"
CONFIG_ARCH_BOARD_A2G_TC397_5V_TFT=y
-CONFIG_ARCH_CHIP="tc397"
-CONFIG_ARCH_CHIP_TC397=y
+CONFIG_ARCH_CHIP="tc3xx"
+CONFIG_ARCH_CHIP_TC39X=y
CONFIG_ARCH_CHIP_TC3XX=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_NUSER_INTERRUPTS=48
diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/include/board.h
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/include/board.h
similarity index 86%
rename from boards/tricore/tc397/a2g-tc397-5v-tft/include/board.h
rename to boards/tricore/tc3xx/a2g-tc397-5v-tft/include/board.h
index 0e4f012fc58..b6464840fb6 100644
--- a/boards/tricore/tc397/a2g-tc397-5v-tft/include/board.h
+++ b/boards/tricore/tc3xx/a2g-tc397-5v-tft/include/board.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc397/a2g-tc397-5v-tft/include/board.h
+ * boards/tricore/tc3xx/a2g-tc397-5v-tft/include/board.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,8 +20,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_TRICORE_TC397_A2G_TC397_5V_TFT_INCLUDE_BOARD_H
-#define __BOARDS_TRICORE_TC397_A2G_TC397_5V_TFT_INCLUDE_BOARD_H
+#ifndef __BOARDS_TRICORE_TC3XX_A2G_TC397_5V_TFT_INCLUDE_BOARD_H
+#define __BOARDS_TRICORE_TC3XX_A2G_TC397_5V_TFT_INCLUDE_BOARD_H
/****************************************************************************
* Included Files
@@ -37,4 +37,4 @@
* Public Functions Definitions
****************************************************************************/
-#endif /* __BOARDS_TRICORE_TC397_A2G_TC397_5V_TFT_INCLUDE_BOARD_H */
+#endif /* __BOARDS_TRICORE_TC3XX_A2G_TC397_5V_TFT_INCLUDE_BOARD_H */
diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/include/board_memorymap.h
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/include/board_memorymap.h
similarity index 98%
rename from boards/tricore/tc397/a2g-tc397-5v-tft/include/board_memorymap.h
rename to boards/tricore/tc3xx/a2g-tc397-5v-tft/include/board_memorymap.h
index 5a90d41c695..c13fb79cce3 100644
--- a/boards/tricore/tc397/a2g-tc397-5v-tft/include/board_memorymap.h
+++ b/boards/tricore/tc3xx/a2g-tc397-5v-tft/include/board_memorymap.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc397/a2g-tc397-5v-tft/include/board_memorymap.h
+ * boards/tricore/tc3xx/a2g-tc397-5v-tft/include/board_memorymap.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,8 +20,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_TRICORE_TC397_A2G_TC397_5V_TFT_INCLUDE_BOARD_MEMORYMAP_H
-#define __BOARDS_TRICORE_TC397_A2G_TC397_5V_TFT_INCLUDE_BOARD_MEMORYMAP_H
+#ifndef __BOARDS_TRICORE_TC3XX_A2G_TC397_5V_TFT_INCLUDE_BOARD_MEMORYMAP_H
+#define __BOARDS_TRICORE_TC3XX_A2G_TC397_5V_TFT_INCLUDE_BOARD_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -358,4 +358,4 @@ extern "C"
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_TRICORE_TC397_A2G_TC397_5V_TFT_INCLUDE_BOARD_MEMORYMAP_H */
+#endif /* __BOARDS_TRICORE_TC3XX_A2G_TC397_5V_TFT_INCLUDE_BOARD_MEMORYMAP_H */
diff --git
a/boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
similarity index 99%
rename from
boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
rename to
boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
index 23a9c438f71..81a9918393b 100644
---
a/boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
+++
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
+ * boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git
a/boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
similarity index 99%
rename from
boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
rename to
boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
index 42ddc47b3ff..ac6cd239e26 100644
--- a/boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
+++ b/boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
+ * boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git
a/boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
similarity index 99%
rename from
boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
rename to
boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
index 1579c1b3354..7063fb0c74f 100644
---
a/boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
+++
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
@@ -1,5 +1,5 @@
/****************************************************************************
- *
boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
+ *
boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git
a/boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
similarity index 98%
rename from
boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
rename to
boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
index 89c54f3f116..2af6a37341f 100644
---
a/boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
+++
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
@@ -1,5 +1,5 @@
/****************************************************************************
- *
boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
+ *
boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Make.defs
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Make.defs
similarity index 96%
rename from boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Make.defs
rename to boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Make.defs
index 9692d30d55a..7225b0c651c 100644
--- a/boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Make.defs
+++ b/boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/tricore/tc397/a2g-tc397-5v-tft/scripts/Make.defs
+# boards/tricore/tc3xx/a2g-tc397-5v-tft/scripts/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/src/CMakeLists.txt
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/src/CMakeLists.txt
similarity index 96%
rename from boards/tricore/tc397/a2g-tc397-5v-tft/src/CMakeLists.txt
rename to boards/tricore/tc3xx/a2g-tc397-5v-tft/src/CMakeLists.txt
index d034097f8b7..358b5f5d6c2 100644
--- a/boards/tricore/tc397/a2g-tc397-5v-tft/src/CMakeLists.txt
+++ b/boards/tricore/tc3xx/a2g-tc397-5v-tft/src/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# boards/tricore/tc397/a2g-tc397-5v-tft/src/CMakeLists.txt
+# boards/tricore/tc3xx/a2g-tc397-5v-tft/src/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/src/Makefile
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/src/Makefile
similarity index 95%
rename from boards/tricore/tc397/a2g-tc397-5v-tft/src/Makefile
rename to boards/tricore/tc3xx/a2g-tc397-5v-tft/src/Makefile
index 49a3beb29c9..d642cb5e845 100644
--- a/boards/tricore/tc397/a2g-tc397-5v-tft/src/Makefile
+++ b/boards/tricore/tc3xx/a2g-tc397-5v-tft/src/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# boards/tricore/tc397/a2g-tc397-5v-tft/src/Makefile
+# boards/tricore/tc3xx/a2g-tc397-5v-tft/src/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397.h
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/src/tc397.h
similarity index 90%
rename from boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397.h
rename to boards/tricore/tc3xx/a2g-tc397-5v-tft/src/tc397.h
index ab230a0b907..4b6fdc94813 100644
--- a/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397.h
+++ b/boards/tricore/tc3xx/a2g-tc397-5v-tft/src/tc397.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397.h
+ * boards/tricore/tc3xx/a2g-tc397-5v-tft/src/tc397.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,8 +20,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_TRICORE_TC397_A2G_TC397_5V_TFT_SRC_TC397_H
-#define __BOARDS_TRICORE_TC397_A2G_TC397_5V_TFT_SRC_TC397_H
+#ifndef __BOARDS_TRICORE_TC3XX_A2G_TC397_5V_TFT_SRC_TC397_H
+#define __BOARDS_TRICORE_TC3XX_A2G_TC397_5V_TFT_SRC_TC397_H
/****************************************************************************
* Included Files
@@ -62,4 +62,4 @@ int tc397_bringup(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_TRICORE_TC397_A2G_TC397_5V_TFT_SRC_TC397_H */
+#endif /* __BOARDS_TRICORE_TC3XX_A2G_TC397_5V_TFT_SRC_TC397_H */
diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_boardinit.c
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/src/tc397_boardinit.c
similarity index 98%
rename from boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_boardinit.c
rename to boards/tricore/tc3xx/a2g-tc397-5v-tft/src/tc397_boardinit.c
index 9c789ca129d..b49502e09d3 100644
--- a/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_boardinit.c
+++ b/boards/tricore/tc3xx/a2g-tc397-5v-tft/src/tc397_boardinit.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_boardinit.c
+ * boards/tricore/tc3xx/a2g-tc397-5v-tft/src/tc397_boardinit.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_bringup.c
b/boards/tricore/tc3xx/a2g-tc397-5v-tft/src/tc397_bringup.c
similarity index 97%
rename from boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_bringup.c
rename to boards/tricore/tc3xx/a2g-tc397-5v-tft/src/tc397_bringup.c
index a014c47ccaf..a7c229de88a 100644
--- a/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_bringup.c
+++ b/boards/tricore/tc3xx/a2g-tc397-5v-tft/src/tc397_bringup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_bringup.c
+ * boards/tricore/tc3xx/a2g-tc397-5v-tft/src/tc397_bringup.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/CMakeLists.txt
b/boards/tricore/tc4xx/triboard_tc4x9_com/CMakeLists.txt
similarity index 94%
rename from boards/tricore/tc4da/triboard_tc4x9_com/CMakeLists.txt
rename to boards/tricore/tc4xx/triboard_tc4x9_com/CMakeLists.txt
index c8bc3a4497b..3c85e105954 100644
--- a/boards/tricore/tc4da/triboard_tc4x9_com/CMakeLists.txt
+++ b/boards/tricore/tc4xx/triboard_tc4x9_com/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# boards/tricore/tc4da/triboard_tc4x9_com/CMakeLists.txt
+# boards/tricore/tc4xx/triboard_tc4x9_com/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/Kconfig
b/boards/tricore/tc4xx/triboard_tc4x9_com/Kconfig
similarity index 100%
rename from boards/tricore/tc4da/triboard_tc4x9_com/Kconfig
rename to boards/tricore/tc4xx/triboard_tc4x9_com/Kconfig
diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/configs/nsh/defconfig
b/boards/tricore/tc4xx/triboard_tc4x9_com/configs/nsh/defconfig
similarity index 96%
rename from boards/tricore/tc4da/triboard_tc4x9_com/configs/nsh/defconfig
rename to boards/tricore/tc4xx/triboard_tc4x9_com/configs/nsh/defconfig
index bc98db1f0cc..8f0e1737c5d 100644
--- a/boards/tricore/tc4da/triboard_tc4x9_com/configs/nsh/defconfig
+++ b/boards/tricore/tc4xx/triboard_tc4x9_com/configs/nsh/defconfig
@@ -9,8 +9,8 @@
CONFIG_ARCH="tricore"
CONFIG_ARCH_BOARD="triboard_tc4x9_com"
CONFIG_ARCH_BOARD_TRIBOARD_TC4X9_COM=y
-CONFIG_ARCH_CHIP="tc4da"
-CONFIG_ARCH_CHIP_TC4DA=y
+CONFIG_ARCH_CHIP="tc4xx"
+CONFIG_ARCH_CHIP_TC4DX=y
CONFIG_ARCH_CHIP_TC4XX=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_NUSER_INTERRUPTS=48
diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/include/board.h
b/boards/tricore/tc4xx/triboard_tc4x9_com/include/board.h
similarity index 86%
rename from boards/tricore/tc4da/triboard_tc4x9_com/include/board.h
rename to boards/tricore/tc4xx/triboard_tc4x9_com/include/board.h
index e7447146ae3..d54335750c6 100644
--- a/boards/tricore/tc4da/triboard_tc4x9_com/include/board.h
+++ b/boards/tricore/tc4xx/triboard_tc4x9_com/include/board.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc4da/triboard_tc4x9_com/include/board.h
+ * boards/tricore/tc4xx/triboard_tc4x9_com/include/board.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,8 +20,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_TRICORE_TC4DA_TRIBOARD_TC4X9_COM_INCLUDE_BOARD_H
-#define __BOARDS_TRICORE_TC4DA_TRIBOARD_TC4X9_COM_INCLUDE_BOARD_H
+#ifndef __BOARDS_TRICORE_TC4XX_TRIBOARD_TC4X9_COM_INCLUDE_BOARD_H
+#define __BOARDS_TRICORE_TC4XX_TRIBOARD_TC4X9_COM_INCLUDE_BOARD_H
/****************************************************************************
* Included Files
@@ -37,4 +37,4 @@
* Public Functions Definitions
****************************************************************************/
-#endif /* __BOARDS_TRICORE_TC4DA_TRIBOARD_TC4X9_COM_INCLUDE_BOARD_H */
+#endif /* __BOARDS_TRICORE_TC4XX_TRIBOARD_TC4X9_COM_INCLUDE_BOARD_H */
diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/include/board_memorymap.h
b/boards/tricore/tc4xx/triboard_tc4x9_com/include/board_memorymap.h
similarity index 98%
rename from boards/tricore/tc4da/triboard_tc4x9_com/include/board_memorymap.h
rename to boards/tricore/tc4xx/triboard_tc4x9_com/include/board_memorymap.h
index 154e6980fcd..27fdf77f381 100644
--- a/boards/tricore/tc4da/triboard_tc4x9_com/include/board_memorymap.h
+++ b/boards/tricore/tc4xx/triboard_tc4x9_com/include/board_memorymap.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc4da/triboard_tc4x9_com/include/board_memorymap.h
+ * boards/tricore/tc4xx/triboard_tc4x9_com/include/board_memorymap.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,8 +20,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_TRICORE_TC4DA_TRIBOARD_TC4X9_COM_INCLUDE_BOARD_MEMORYMAP_H
-#define __BOARDS_TRICORE_TC4DA_TRIBOARD_TC4X9_COM_INCLUDE_BOARD_MEMORYMAP_H
+#ifndef __BOARDS_TRICORE_TC4XX_TRIBOARD_TC4X9_COM_INCLUDE_BOARD_MEMORYMAP_H
+#define __BOARDS_TRICORE_TC4XX_TRIBOARD_TC4X9_COM_INCLUDE_BOARD_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -449,4 +449,4 @@ extern "C"
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_TRICORE_TC4DA_TRIBOARD_TC4X9_COM_INCLUDE_BOARD_MEMORYMAP_H
*/
+#endif /* __BOARDS_TRICORE_TC4XX_TRIBOARD_TC4X9_COM_INCLUDE_BOARD_MEMORYMAP_H
*/
diff --git
a/boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
b/boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
similarity index 99%
rename from
boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
rename to
boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
index 69780d11f5b..f27afd54bc0 100644
---
a/boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
+++
b/boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
@@ -1,5 +1,5 @@
/****************************************************************************
- *
boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
+ *
boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.kernel
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git
a/boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
b/boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
similarity index 99%
rename from
boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
rename to
boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
index 98393894ed5..bd4bc461950 100644
---
a/boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
+++
b/boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
+ * boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Gnuc_Tricore_Tc.lsl.user
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git
a/boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
b/boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
similarity index 99%
rename from
boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
rename to
boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
index 79dc34e3891..e9a6535ac89 100644
---
a/boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
+++
b/boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
@@ -1,5 +1,5 @@
/****************************************************************************
- *
boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
+ *
boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.kernel
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git
a/boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
b/boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
similarity index 99%
rename from
boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
rename to
boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
index 0bb924ba689..969d8e055d4 100644
---
a/boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
+++
b/boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
@@ -1,5 +1,5 @@
/****************************************************************************
- *
boards/tricore/tc4da/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
+ *
boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Lcf_Tasking_Tricore_Tc.lsl.user
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/scripts/Make.defs
b/boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Make.defs
similarity index 96%
rename from boards/tricore/tc4da/triboard_tc4x9_com/scripts/Make.defs
rename to boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Make.defs
index d015a3ceca6..433477bceaa 100644
--- a/boards/tricore/tc4da/triboard_tc4x9_com/scripts/Make.defs
+++ b/boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/tricore/tc4da/triboard_tc4x9_com/scripts/Make.defs
+# boards/tricore/tc4xx/triboard_tc4x9_com/scripts/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/src/CMakeLists.txt
b/boards/tricore/tc4xx/triboard_tc4x9_com/src/CMakeLists.txt
similarity index 96%
rename from boards/tricore/tc4da/triboard_tc4x9_com/src/CMakeLists.txt
rename to boards/tricore/tc4xx/triboard_tc4x9_com/src/CMakeLists.txt
index 3ed0a4855ed..cea6bde4273 100644
--- a/boards/tricore/tc4da/triboard_tc4x9_com/src/CMakeLists.txt
+++ b/boards/tricore/tc4xx/triboard_tc4x9_com/src/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# boards/tricore/tc4da/triboard_tc4x9_com/src/CMakeLists.txt
+# boards/tricore/tc4xx/triboard_tc4x9_com/src/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/src/Makefile
b/boards/tricore/tc4xx/triboard_tc4x9_com/src/Makefile
similarity index 95%
rename from boards/tricore/tc4da/triboard_tc4x9_com/src/Makefile
rename to boards/tricore/tc4xx/triboard_tc4x9_com/src/Makefile
index 30abecc8728..039360cb944 100644
--- a/boards/tricore/tc4da/triboard_tc4x9_com/src/Makefile
+++ b/boards/tricore/tc4xx/triboard_tc4x9_com/src/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# boards/tricore/tc4da/triboard_tc4x9_com/src/Makefile
+# boards/tricore/tc4xx/triboard_tc4x9_com/src/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da.h
b/boards/tricore/tc4xx/triboard_tc4x9_com/src/tc4da.h
similarity index 90%
rename from boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da.h
rename to boards/tricore/tc4xx/triboard_tc4x9_com/src/tc4da.h
index 9cb69f9b2b8..4d804ea5295 100644
--- a/boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da.h
+++ b/boards/tricore/tc4xx/triboard_tc4x9_com/src/tc4da.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da.h
+ * boards/tricore/tc4xx/triboard_tc4x9_com/src/tc4da.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,8 +20,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_TRICORE_TC4DA_TRIBOARD_TC4X9_COM_SRC_TC4DA_H
-#define __BOARDS_TRICORE_TC4DA_TRIBOARD_TC4X9_COM_SRC_TC4DA_H
+#ifndef __BOARDS_TRICORE_TC4XX_TRIBOARD_TC4X9_COM_SRC_TC4DA_H
+#define __BOARDS_TRICORE_TC4XX_TRIBOARD_TC4X9_COM_SRC_TC4DA_H
/****************************************************************************
* Included Files
@@ -62,4 +62,4 @@ int tc4da_bringup(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_TRICORE_TC4DA_TRIBOARD_TC4X9_COM_SRC_TC4DA_H */
+#endif /* __BOARDS_TRICORE_TC4XX_TRIBOARD_TC4X9_COM_SRC_TC4DA_H */
diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da_boardinit.c
b/boards/tricore/tc4xx/triboard_tc4x9_com/src/tc4da_boardinit.c
similarity index 98%
rename from boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da_boardinit.c
rename to boards/tricore/tc4xx/triboard_tc4x9_com/src/tc4da_boardinit.c
index adfdb89a8be..b940b91156f 100644
--- a/boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da_boardinit.c
+++ b/boards/tricore/tc4xx/triboard_tc4x9_com/src/tc4da_boardinit.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da_boardinit.c
+ * boards/tricore/tc4xx/triboard_tc4x9_com/src/tc4da_boardinit.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da_bringup.c
b/boards/tricore/tc4xx/triboard_tc4x9_com/src/tc4da_bringup.c
similarity index 97%
rename from boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da_bringup.c
rename to boards/tricore/tc4xx/triboard_tc4x9_com/src/tc4da_bringup.c
index b802b389f03..7a27567b277 100644
--- a/boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da_bringup.c
+++ b/boards/tricore/tc4xx/triboard_tc4x9_com/src/tc4da_bringup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da_bringup.c
+ * boards/tricore/tc4xx/triboard_tc4x9_com/src/tc4da_bringup.c
*
* SPDX-License-Identifier: Apache-2.0
*
