RT-Thread · mysterywolf · Sep 13, 2024 · Sep 12, 2024
diff --git a/libcpu/risc-v/SConscript b/libcpu/risc-v/SConscript
@@ -5,17 +5,16 @@ from building import *
 
 Import('rtconfig')
 
+common64_arch = ['virt64', 'c906']
 cwd   = GetCurrentDir()
 group = []
 list  = os.listdir(cwd)
 
 # add common code files
-if   rtconfig.CPU == "virt64" :
-    group = group
-elif rtconfig.CPU == "c906" :
-    group = group
+if rtconfig.CPU in common64_arch :
+    group += SConscript(os.path.join('common64', 'SConscript'))
 else :
-    group = group + SConscript(os.path.join('common', 'SConscript'))
+    group += SConscript(os.path.join('common', 'SConscript'))
 
 # cpu porting code files
 if  rtconfig.CPU == "c906":

diff --git a/libcpu/risc-v/common64/SConscript b/libcpu/risc-v/common64/SConscript
@@ -0,0 +1,12 @@
+from building import *
+
+cwd     = GetCurrentDir()
+src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
+CPPPATH = [cwd]
+
+if not GetDepend('ARCH_USING_ASID'):
+    SrcRemove(src, ['asid.c'])
+
+group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+
+Return('group')
diff --git a/libcpu/risc-v/t-head/c906/asid.c → libcpu/risc-v/common64/asid.c b/libcpu/risc-v/t-head/c906/asid.c → libcpu/risc-v/common64/asid.c
diff --git a/libcpu/risc-v/t-head/c906/asm-generic.h → libcpu/risc-v/common64/asm-generic.h b/libcpu/risc-v/t-head/c906/asm-generic.h → libcpu/risc-v/common64/asm-generic.h
diff --git a/libcpu/risc-v/t-head/c906/backtrace.c → libcpu/risc-v/common64/backtrace.c b/libcpu/risc-v/t-head/c906/backtrace.c → libcpu/risc-v/common64/backtrace.c
diff --git a/libcpu/risc-v/t-head/c906/context_gcc.S → libcpu/risc-v/common64/context_gcc.S b/libcpu/risc-v/t-head/c906/context_gcc.S → libcpu/risc-v/common64/context_gcc.S
diff --git a/libcpu/risc-v/t-head/c906/cpuport.c → libcpu/risc-v/common64/cpuport.c b/libcpu/risc-v/t-head/c906/cpuport.c → libcpu/risc-v/common64/cpuport.c
diff --git a/libcpu/risc-v/t-head/c906/cpuport.h → libcpu/risc-v/common64/cpuport.h b/libcpu/risc-v/t-head/c906/cpuport.h → libcpu/risc-v/common64/cpuport.h
diff --git a/libcpu/risc-v/t-head/c906/cpuport_gcc.S → libcpu/risc-v/common64/cpuport_gcc.S b/libcpu/risc-v/t-head/c906/cpuport_gcc.S → libcpu/risc-v/common64/cpuport_gcc.S
diff --git a/libcpu/risc-v/t-head/c906/encoding.h → libcpu/risc-v/common64/encoding.h b/libcpu/risc-v/t-head/c906/encoding.h → libcpu/risc-v/common64/encoding.h
diff --git a/libcpu/risc-v/t-head/c906/ext_context.h → libcpu/risc-v/common64/ext_context.h b/libcpu/risc-v/t-head/c906/ext_context.h → libcpu/risc-v/common64/ext_context.h
diff --git a/libcpu/risc-v/t-head/c906/interrupt_gcc.S → libcpu/risc-v/common64/interrupt_gcc.S b/libcpu/risc-v/t-head/c906/interrupt_gcc.S → libcpu/risc-v/common64/interrupt_gcc.S
diff --git a/libcpu/risc-v/t-head/c906/io.h → libcpu/risc-v/common64/io.h b/libcpu/risc-v/t-head/c906/io.h → libcpu/risc-v/common64/io.h
diff --git a/libcpu/risc-v/t-head/c906/mmu.c → libcpu/risc-v/common64/mmu.c b/libcpu/risc-v/t-head/c906/mmu.c → libcpu/risc-v/common64/mmu.c
diff --git a/libcpu/risc-v/t-head/c906/mmu.h → libcpu/risc-v/common64/mmu.h b/libcpu/risc-v/t-head/c906/mmu.h → libcpu/risc-v/common64/mmu.h
diff --git a/libcpu/risc-v/t-head/c906/riscv.h → libcpu/risc-v/common64/riscv.h b/libcpu/risc-v/t-head/c906/riscv.h → libcpu/risc-v/common64/riscv.h
diff --git a/libcpu/risc-v/t-head/c906/riscv_io.h → libcpu/risc-v/common64/riscv_io.h b/libcpu/risc-v/t-head/c906/riscv_io.h → libcpu/risc-v/common64/riscv_io.h
diff --git a/libcpu/risc-v/t-head/c906/riscv_mmu.c → libcpu/risc-v/common64/riscv_mmu.c b/libcpu/risc-v/t-head/c906/riscv_mmu.c → libcpu/risc-v/common64/riscv_mmu.c
diff --git a/libcpu/risc-v/t-head/c906/sbi.c → libcpu/risc-v/common64/sbi.c b/libcpu/risc-v/t-head/c906/sbi.c → libcpu/risc-v/common64/sbi.c
diff --git a/libcpu/risc-v/t-head/c906/sbi.h → libcpu/risc-v/common64/sbi.h b/libcpu/risc-v/t-head/c906/sbi.h → libcpu/risc-v/common64/sbi.h
diff --git a/libcpu/risc-v/t-head/c906/stack.h → libcpu/risc-v/common64/stack.h b/libcpu/risc-v/t-head/c906/stack.h → libcpu/risc-v/common64/stack.h
diff --git a/libcpu/risc-v/t-head/c906/stackframe.h → libcpu/risc-v/common64/stackframe.h b/libcpu/risc-v/t-head/c906/stackframe.h → libcpu/risc-v/common64/stackframe.h
diff --git a/libcpu/risc-v/t-head/c906/startup_gcc.S → libcpu/risc-v/common64/startup_gcc.S b/libcpu/risc-v/t-head/c906/startup_gcc.S → libcpu/risc-v/common64/startup_gcc.S
diff --git a/libcpu/risc-v/t-head/c906/syscall_c.c → libcpu/risc-v/common64/syscall_c.c b/libcpu/risc-v/t-head/c906/syscall_c.c → libcpu/risc-v/common64/syscall_c.c
diff --git a/libcpu/risc-v/t-head/c906/tick.c → libcpu/risc-v/common64/tick.c b/libcpu/risc-v/t-head/c906/tick.c → libcpu/risc-v/common64/tick.c
diff --git a/libcpu/risc-v/t-head/c906/tick.h → libcpu/risc-v/common64/tick.h b/libcpu/risc-v/t-head/c906/tick.h → libcpu/risc-v/common64/tick.h
diff --git a/libcpu/risc-v/t-head/c906/tlb.h → libcpu/risc-v/common64/tlb.h b/libcpu/risc-v/t-head/c906/tlb.h → libcpu/risc-v/common64/tlb.h
diff --git a/libcpu/risc-v/t-head/c906/trap.c → libcpu/risc-v/common64/trap.c b/libcpu/risc-v/t-head/c906/trap.c → libcpu/risc-v/common64/trap.c
diff --git a/libcpu/risc-v/virt64/SConscript b/libcpu/risc-v/virt64/SConscript
@@ -5,9 +5,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 
-if not GetDepend('ARCH_USING_ASID'):
-    SrcRemove(src, ['asid.c'])
-
 if not GetDepend('ARCH_RISCV_VECTOR'):
     SrcRemove(src, ['vector_gcc.S'])
 

diff --git a/libcpu/risc-v/virt64/asid.c b/libcpu/risc-v/virt64/asid.c
diff --git a/libcpu/risc-v/virt64/asm-generic.h b/libcpu/risc-v/virt64/asm-generic.h
diff --git a/libcpu/risc-v/virt64/backtrace.c b/libcpu/risc-v/virt64/backtrace.c