From 6c081947b5c68819cc5ba9fd058e7bd29e9ca62a Mon Sep 17 00:00:00 2001
From: xuzhuoyi <xzy476386434@vip.qq.com>
Date: Sat, 24 Nov 2018 17:41:55 +0800
Subject: [PATCH] [bsp][tms320f28379d] Classify c28x into ti-dsp

---
 bsp/tms320f28379d/.config                                 | 3 ++-
 bsp/tms320f28379d/.project                                | 8 ++++----
 .../.settings/org.eclipse.core.resources.prefs            | 6 ++----
 bsp/tms320f28379d/Kconfig                                 | 2 +-
 bsp/tms320f28379d/rtconfig.h                              | 3 ++-
 libcpu/Kconfig                                            | 6 +++++-
 libcpu/{ => ti-dsp}/c28x/context.s                        | 0
 libcpu/{ => ti-dsp}/c28x/cpuport.c                        | 0
 8 files changed, 16 insertions(+), 12 deletions(-)
 rename libcpu/{ => ti-dsp}/c28x/context.s (100%)
 rename libcpu/{ => ti-dsp}/c28x/cpuport.c (100%)

diff --git a/bsp/tms320f28379d/.config b/bsp/tms320f28379d/.config
index 5337bc7be1..ddc9fd302e 100644
--- a/bsp/tms320f28379d/.config
+++ b/bsp/tms320f28379d/.config
@@ -62,7 +62,8 @@ CONFIG_RT_USING_DEVICE=y
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=128
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart"
-CONFIG_ARCH_C28X=y
+CONFIG_ARCH_TIDSP=y
+CONFIG_ARCH_TIDSP_C28X=y
 CONFIG_ARCH_CPU_STACK_GROWS_UPWARD=y
 
 #
diff --git a/bsp/tms320f28379d/.project b/bsp/tms320f28379d/.project
index 6d19540441..bab120e2b9 100644
--- a/bsp/tms320f28379d/.project
+++ b/bsp/tms320f28379d/.project
@@ -26,14 +26,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>C28X</name>
+			<name>Kernel</name>
 			<type>2</type>
-			<locationURI>PARENT-2-PROJECT_LOC/libcpu/c28x</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/src</locationURI>
 		</link>
 		<link>
-			<name>Kernel</name>
+			<name>c28x</name>
 			<type>2</type>
-			<locationURI>PARENT-2-PROJECT_LOC/src</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/libcpu/ti-dsp/c28x</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/bsp/tms320f28379d/.settings/org.eclipse.core.resources.prefs b/bsp/tms320f28379d/.settings/org.eclipse.core.resources.prefs
index f5eae4d90c..288ca292c6 100644
--- a/bsp/tms320f28379d/.settings/org.eclipse.core.resources.prefs
+++ b/bsp/tms320f28379d/.settings/org.eclipse.core.resources.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
-encoding//Debug/C28X/subdir_rules.mk=UTF-8
-encoding//Debug/C28X/subdir_vars.mk=UTF-8
 encoding//Debug/Kernel/subdir_rules.mk=UTF-8
 encoding//Debug/Kernel/subdir_vars.mk=UTF-8
 encoding//Debug/applications/subdir_rules.mk=UTF-8
 encoding//Debug/applications/subdir_vars.mk=UTF-8
+encoding//Debug/c28x/subdir_rules.mk=UTF-8
+encoding//Debug/c28x/subdir_vars.mk=UTF-8
 encoding//Debug/drivers/subdir_rules.mk=UTF-8
 encoding//Debug/drivers/subdir_vars.mk=UTF-8
 encoding//Debug/libraries/common/source/subdir_rules.mk=UTF-8
@@ -13,8 +13,6 @@ encoding//Debug/libraries/headers/cmd/subdir_rules.mk=UTF-8
 encoding//Debug/libraries/headers/cmd/subdir_vars.mk=UTF-8
 encoding//Debug/libraries/headers/source/subdir_rules.mk=UTF-8
 encoding//Debug/libraries/headers/source/subdir_vars.mk=UTF-8
-encoding//Debug/libraries/subdir_rules.mk=UTF-8
-encoding//Debug/libraries/subdir_vars.mk=UTF-8
 encoding//Debug/makefile=UTF-8
 encoding//Debug/objects.mk=UTF-8
 encoding//Debug/sources.mk=UTF-8
diff --git a/bsp/tms320f28379d/Kconfig b/bsp/tms320f28379d/Kconfig
index 38b1a5b179..de11cb4d79 100644
--- a/bsp/tms320f28379d/Kconfig
+++ b/bsp/tms320f28379d/Kconfig
@@ -20,7 +20,7 @@ config $PKGS_DIR
 
 config SOC_TMS320F28X
     bool
-    select ARCH_C28X
+    select ARCH_TIDSP_C28X
     default y
 
 source "$RTT_DIR/Kconfig"
diff --git a/bsp/tms320f28379d/rtconfig.h b/bsp/tms320f28379d/rtconfig.h
index f0c62c21d2..f74783569c 100644
--- a/bsp/tms320f28379d/rtconfig.h
+++ b/bsp/tms320f28379d/rtconfig.h
@@ -40,7 +40,8 @@
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 128
 #define RT_CONSOLE_DEVICE_NAME "uart"
-#define ARCH_C28X
+#define ARCH_TIDSP
+#define ARCH_TIDSP_C28X
 #define ARCH_CPU_STACK_GROWS_UPWARD
 
 /* RT-Thread Components */
diff --git a/libcpu/Kconfig b/libcpu/Kconfig
index 72e6470b6a..22b4a6336a 100644
--- a/libcpu/Kconfig
+++ b/libcpu/Kconfig
@@ -86,8 +86,12 @@ config ARCH_RISCV
 config ARCH_IA32
     bool
 
-config ARCH_C28X
+config ARCH_TIDSP
     bool
+
+config ARCH_TIDSP_C28X
+    bool
+    select ARCH_TIDSP
     select ARCH_CPU_STACK_GROWS_UPWARD
 
 config ARCH_HOST_SIMULATOR
diff --git a/libcpu/c28x/context.s b/libcpu/ti-dsp/c28x/context.s
similarity index 100%
rename from libcpu/c28x/context.s
rename to libcpu/ti-dsp/c28x/context.s
diff --git a/libcpu/c28x/cpuport.c b/libcpu/ti-dsp/c28x/cpuport.c
similarity index 100%
rename from libcpu/c28x/cpuport.c
rename to libcpu/ti-dsp/c28x/cpuport.c
-- 
GitLab