summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bsp/xuantie/smartl/e902/SConscript12
-rw-r--r--bsp/xuantie/smartl/e902/rtconfig.py4
-rw-r--r--bsp/xuantie/smartl/e906/SConscript12
-rw-r--r--bsp/xuantie/smartl/e906/rtconfig.py4
-rw-r--r--bsp/xuantie/smartl/e907/SConscript12
-rw-r--r--bsp/xuantie/smartl/e907/rtconfig.py4
-rw-r--r--bsp/xuantie/tools/sdk_dist.py17
-rw-r--r--bsp/xuantie/xiaohui/c906/SConscript12
-rw-r--r--bsp/xuantie/xiaohui/c906/rtconfig.py4
-rw-r--r--bsp/xuantie/xiaohui/c907/SConscript12
-rw-r--r--bsp/xuantie/xiaohui/c907/rtconfig.py4
-rw-r--r--bsp/xuantie/xiaohui/c908/SConscript12
-rw-r--r--bsp/xuantie/xiaohui/c908/rtconfig.py4
-rw-r--r--bsp/xuantie/xiaohui/c910/SConscript12
-rw-r--r--bsp/xuantie/xiaohui/c910/rtconfig.py4
-rw-r--r--bsp/xuantie/xiaohui/r908/SConscript12
-rw-r--r--bsp/xuantie/xiaohui/r908/rtconfig.py4
-rw-r--r--bsp/xuantie/xiaohui/r910/SConscript12
-rw-r--r--bsp/xuantie/xiaohui/r910/rtconfig.py2
-rw-r--r--bsp/xuantie/xiaohui/r920/SConscript12
-rw-r--r--bsp/xuantie/xiaohui/r920/rtconfig.py4
21 files changed, 126 insertions, 49 deletions
diff --git a/bsp/xuantie/smartl/e902/SConscript b/bsp/xuantie/smartl/e902/SConscript
index 20f7689c53..27c6c5f635 100644
--- a/bsp/xuantie/smartl/e902/SConscript
+++ b/bsp/xuantie/smartl/e902/SConscript
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
objs = []
list = os.listdir(cwd)
-for d in list:
- path = os.path.join(cwd, d)
- if os.path.isfile(os.path.join(path, 'SConscript')):
- objs = objs + SConscript(os.path.join(d, 'SConscript'))
+for item in list:
+ path = os.path.join(cwd, item)
+ if item == 'libraries' or not os.path.isdir(path):
+ continue
+
+ sconscript_path = os.path.join(path, 'SConscript')
+ if os.path.isfile(sconscript_path):
+ objs.extend(SConscript(os.path.join(item, 'SConscript')))
Return('objs')
diff --git a/bsp/xuantie/smartl/e902/rtconfig.py b/bsp/xuantie/smartl/e902/rtconfig.py
index 2406d70e5c..0d837041f1 100644
--- a/bsp/xuantie/smartl/e902/rtconfig.py
+++ b/bsp/xuantie/smartl/e902/rtconfig.py
@@ -24,6 +24,8 @@ BUILD = 'debug'
CORE = 'risc-v'
MAP_FILE = 'rtthread.map'
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_smartl.ld'
+if os.path.exists('./libraries'):
+ LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_smartl.ld'
TARGET_NAME = 'rtthread.bin'
#------- GCC settings ----------------------------------------------------------
@@ -85,6 +87,6 @@ if PLATFORM == 'gcc':
def dist_handle(BSP_ROOT, dist_dir):
import sys
cwd_path = os.getcwd()
- sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
+ sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
from sdk_dist import dist_do_building
dist_do_building(BSP_ROOT, dist_dir)
diff --git a/bsp/xuantie/smartl/e906/SConscript b/bsp/xuantie/smartl/e906/SConscript
index 20f7689c53..27c6c5f635 100644
--- a/bsp/xuantie/smartl/e906/SConscript
+++ b/bsp/xuantie/smartl/e906/SConscript
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
objs = []
list = os.listdir(cwd)
-for d in list:
- path = os.path.join(cwd, d)
- if os.path.isfile(os.path.join(path, 'SConscript')):
- objs = objs + SConscript(os.path.join(d, 'SConscript'))
+for item in list:
+ path = os.path.join(cwd, item)
+ if item == 'libraries' or not os.path.isdir(path):
+ continue
+
+ sconscript_path = os.path.join(path, 'SConscript')
+ if os.path.isfile(sconscript_path):
+ objs.extend(SConscript(os.path.join(item, 'SConscript')))
Return('objs')
diff --git a/bsp/xuantie/smartl/e906/rtconfig.py b/bsp/xuantie/smartl/e906/rtconfig.py
index c24bf39ff1..55b0a206bf 100644
--- a/bsp/xuantie/smartl/e906/rtconfig.py
+++ b/bsp/xuantie/smartl/e906/rtconfig.py
@@ -24,6 +24,8 @@ BUILD = 'debug'
CORE = 'risc-v'
MAP_FILE = 'rtthread.map'
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_smartl.ld'
+if os.path.exists('./libraries'):
+ LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_smartl.ld'
TARGET_NAME = 'rtthread.bin'
#------- GCC settings ----------------------------------------------------------
@@ -85,6 +87,6 @@ if PLATFORM == 'gcc':
def dist_handle(BSP_ROOT, dist_dir):
import sys
cwd_path = os.getcwd()
- sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
+ sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
from sdk_dist import dist_do_building
dist_do_building(BSP_ROOT, dist_dir)
diff --git a/bsp/xuantie/smartl/e907/SConscript b/bsp/xuantie/smartl/e907/SConscript
index 20f7689c53..27c6c5f635 100644
--- a/bsp/xuantie/smartl/e907/SConscript
+++ b/bsp/xuantie/smartl/e907/SConscript
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
objs = []
list = os.listdir(cwd)
-for d in list:
- path = os.path.join(cwd, d)
- if os.path.isfile(os.path.join(path, 'SConscript')):
- objs = objs + SConscript(os.path.join(d, 'SConscript'))
+for item in list:
+ path = os.path.join(cwd, item)
+ if item == 'libraries' or not os.path.isdir(path):
+ continue
+
+ sconscript_path = os.path.join(path, 'SConscript')
+ if os.path.isfile(sconscript_path):
+ objs.extend(SConscript(os.path.join(item, 'SConscript')))
Return('objs')
diff --git a/bsp/xuantie/smartl/e907/rtconfig.py b/bsp/xuantie/smartl/e907/rtconfig.py
index ae746d32bc..895fc2caa9 100644
--- a/bsp/xuantie/smartl/e907/rtconfig.py
+++ b/bsp/xuantie/smartl/e907/rtconfig.py
@@ -24,6 +24,8 @@ BUILD = 'debug'
CORE = 'risc-v'
MAP_FILE = 'rtthread.map'
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_smartl.ld'
+if os.path.exists('./libraries'):
+ LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_smartl.ld'
TARGET_NAME = 'rtthread.bin'
#------- GCC settings ----------------------------------------------------------
@@ -85,6 +87,6 @@ if PLATFORM == 'gcc':
def dist_handle(BSP_ROOT, dist_dir):
import sys
cwd_path = os.getcwd()
- sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
+ sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
from sdk_dist import dist_do_building
dist_do_building(BSP_ROOT, dist_dir)
diff --git a/bsp/xuantie/tools/sdk_dist.py b/bsp/xuantie/tools/sdk_dist.py
new file mode 100644
index 0000000000..c6b388f2bb
--- /dev/null
+++ b/bsp/xuantie/tools/sdk_dist.py
@@ -0,0 +1,17 @@
+import os
+import sys
+import shutil
+
+cwd_path = os.getcwd()
+sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools'))
+
+# BSP dist function
+def dist_do_building(BSP_ROOT, dist_dir):
+ from mkdist import bsp_copy_files
+ import rtconfig
+
+ print(dist_dir)
+ print("=> copy XUANTIE bsp library")
+ library_dir = os.path.join(dist_dir, './libraries')
+ library_path = os.path.join(os.path.dirname(BSP_ROOT), '../libraries')
+ bsp_copy_files(library_path, library_dir)
diff --git a/bsp/xuantie/xiaohui/c906/SConscript b/bsp/xuantie/xiaohui/c906/SConscript
index 20f7689c53..27c6c5f635 100644
--- a/bsp/xuantie/xiaohui/c906/SConscript
+++ b/bsp/xuantie/xiaohui/c906/SConscript
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
objs = []
list = os.listdir(cwd)
-for d in list:
- path = os.path.join(cwd, d)
- if os.path.isfile(os.path.join(path, 'SConscript')):
- objs = objs + SConscript(os.path.join(d, 'SConscript'))
+for item in list:
+ path = os.path.join(cwd, item)
+ if item == 'libraries' or not os.path.isdir(path):
+ continue
+
+ sconscript_path = os.path.join(path, 'SConscript')
+ if os.path.isfile(sconscript_path):
+ objs.extend(SConscript(os.path.join(item, 'SConscript')))
Return('objs')
diff --git a/bsp/xuantie/xiaohui/c906/rtconfig.py b/bsp/xuantie/xiaohui/c906/rtconfig.py
index bdfeb77ffd..9b026af838 100644
--- a/bsp/xuantie/xiaohui/c906/rtconfig.py
+++ b/bsp/xuantie/xiaohui/c906/rtconfig.py
@@ -24,6 +24,8 @@ BUILD = 'debug'
CORE = 'risc-v'
MAP_FILE = 'rtthread.map'
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
+if os.path.exists('./libraries'):
+ LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
TARGET_NAME = 'rtthread.bin'
#------- GCC settings ----------------------------------------------------------
@@ -92,6 +94,6 @@ if PLATFORM == 'gcc':
def dist_handle(BSP_ROOT, dist_dir):
import sys
cwd_path = os.getcwd()
- sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
+ sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
from sdk_dist import dist_do_building
dist_do_building(BSP_ROOT, dist_dir)
diff --git a/bsp/xuantie/xiaohui/c907/SConscript b/bsp/xuantie/xiaohui/c907/SConscript
index 20f7689c53..27c6c5f635 100644
--- a/bsp/xuantie/xiaohui/c907/SConscript
+++ b/bsp/xuantie/xiaohui/c907/SConscript
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
objs = []
list = os.listdir(cwd)
-for d in list:
- path = os.path.join(cwd, d)
- if os.path.isfile(os.path.join(path, 'SConscript')):
- objs = objs + SConscript(os.path.join(d, 'SConscript'))
+for item in list:
+ path = os.path.join(cwd, item)
+ if item == 'libraries' or not os.path.isdir(path):
+ continue
+
+ sconscript_path = os.path.join(path, 'SConscript')
+ if os.path.isfile(sconscript_path):
+ objs.extend(SConscript(os.path.join(item, 'SConscript')))
Return('objs')
diff --git a/bsp/xuantie/xiaohui/c907/rtconfig.py b/bsp/xuantie/xiaohui/c907/rtconfig.py
index bca29abd04..e4b6d5dd3a 100644
--- a/bsp/xuantie/xiaohui/c907/rtconfig.py
+++ b/bsp/xuantie/xiaohui/c907/rtconfig.py
@@ -24,6 +24,8 @@ BUILD = 'debug'
CORE = 'risc-v'
MAP_FILE = 'rtthread.map'
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
+if os.path.exists('./libraries'):
+ LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
TARGET_NAME = 'rtthread.bin'
#------- GCC settings ----------------------------------------------------------
@@ -92,6 +94,6 @@ if PLATFORM == 'gcc':
def dist_handle(BSP_ROOT, dist_dir):
import sys
cwd_path = os.getcwd()
- sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
+ sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
from sdk_dist import dist_do_building
dist_do_building(BSP_ROOT, dist_dir)
diff --git a/bsp/xuantie/xiaohui/c908/SConscript b/bsp/xuantie/xiaohui/c908/SConscript
index 20f7689c53..27c6c5f635 100644
--- a/bsp/xuantie/xiaohui/c908/SConscript
+++ b/bsp/xuantie/xiaohui/c908/SConscript
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
objs = []
list = os.listdir(cwd)
-for d in list:
- path = os.path.join(cwd, d)
- if os.path.isfile(os.path.join(path, 'SConscript')):
- objs = objs + SConscript(os.path.join(d, 'SConscript'))
+for item in list:
+ path = os.path.join(cwd, item)
+ if item == 'libraries' or not os.path.isdir(path):
+ continue
+
+ sconscript_path = os.path.join(path, 'SConscript')
+ if os.path.isfile(sconscript_path):
+ objs.extend(SConscript(os.path.join(item, 'SConscript')))
Return('objs')
diff --git a/bsp/xuantie/xiaohui/c908/rtconfig.py b/bsp/xuantie/xiaohui/c908/rtconfig.py
index bc5067eed5..f9fa78c99f 100644
--- a/bsp/xuantie/xiaohui/c908/rtconfig.py
+++ b/bsp/xuantie/xiaohui/c908/rtconfig.py
@@ -24,6 +24,8 @@ BUILD = 'debug'
CORE = 'risc-v'
MAP_FILE = 'rtthread.map'
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
+if os.path.exists('./libraries'):
+ LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
TARGET_NAME = 'rtthread.bin'
#------- GCC settings ----------------------------------------------------------
@@ -93,6 +95,6 @@ if PLATFORM == 'gcc':
def dist_handle(BSP_ROOT, dist_dir):
import sys
cwd_path = os.getcwd()
- sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
+ sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
from sdk_dist import dist_do_building
dist_do_building(BSP_ROOT, dist_dir)
diff --git a/bsp/xuantie/xiaohui/c910/SConscript b/bsp/xuantie/xiaohui/c910/SConscript
index 20f7689c53..27c6c5f635 100644
--- a/bsp/xuantie/xiaohui/c910/SConscript
+++ b/bsp/xuantie/xiaohui/c910/SConscript
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
objs = []
list = os.listdir(cwd)
-for d in list:
- path = os.path.join(cwd, d)
- if os.path.isfile(os.path.join(path, 'SConscript')):
- objs = objs + SConscript(os.path.join(d, 'SConscript'))
+for item in list:
+ path = os.path.join(cwd, item)
+ if item == 'libraries' or not os.path.isdir(path):
+ continue
+
+ sconscript_path = os.path.join(path, 'SConscript')
+ if os.path.isfile(sconscript_path):
+ objs.extend(SConscript(os.path.join(item, 'SConscript')))
Return('objs')
diff --git a/bsp/xuantie/xiaohui/c910/rtconfig.py b/bsp/xuantie/xiaohui/c910/rtconfig.py
index 68fd80a0e1..f8763d8549 100644
--- a/bsp/xuantie/xiaohui/c910/rtconfig.py
+++ b/bsp/xuantie/xiaohui/c910/rtconfig.py
@@ -24,6 +24,8 @@ BUILD = 'debug'
CORE = 'risc-v'
MAP_FILE = 'rtthread.map'
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
+if os.path.exists('./libraries'):
+ LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
TARGET_NAME = 'rtthread.bin'
#------- GCC settings ----------------------------------------------------------
@@ -92,6 +94,6 @@ if PLATFORM == 'gcc':
def dist_handle(BSP_ROOT, dist_dir):
import sys
cwd_path = os.getcwd()
- sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
+ sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
from sdk_dist import dist_do_building
dist_do_building(BSP_ROOT, dist_dir)
diff --git a/bsp/xuantie/xiaohui/r908/SConscript b/bsp/xuantie/xiaohui/r908/SConscript
index 20f7689c53..27c6c5f635 100644
--- a/bsp/xuantie/xiaohui/r908/SConscript
+++ b/bsp/xuantie/xiaohui/r908/SConscript
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
objs = []
list = os.listdir(cwd)
-for d in list:
- path = os.path.join(cwd, d)
- if os.path.isfile(os.path.join(path, 'SConscript')):
- objs = objs + SConscript(os.path.join(d, 'SConscript'))
+for item in list:
+ path = os.path.join(cwd, item)
+ if item == 'libraries' or not os.path.isdir(path):
+ continue
+
+ sconscript_path = os.path.join(path, 'SConscript')
+ if os.path.isfile(sconscript_path):
+ objs.extend(SConscript(os.path.join(item, 'SConscript')))
Return('objs')
diff --git a/bsp/xuantie/xiaohui/r908/rtconfig.py b/bsp/xuantie/xiaohui/r908/rtconfig.py
index b47f8a9776..514216239c 100644
--- a/bsp/xuantie/xiaohui/r908/rtconfig.py
+++ b/bsp/xuantie/xiaohui/r908/rtconfig.py
@@ -24,6 +24,8 @@ BUILD = 'debug'
CORE = 'risc-v'
MAP_FILE = 'rtthread.map'
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
+if os.path.exists('./libraries'):
+ LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
TARGET_NAME = 'rtthread.bin'
#------- GCC settings ----------------------------------------------------------
@@ -92,6 +94,6 @@ if PLATFORM == 'gcc':
def dist_handle(BSP_ROOT, dist_dir):
import sys
cwd_path = os.getcwd()
- sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
+ sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
from sdk_dist import dist_do_building
dist_do_building(BSP_ROOT, dist_dir)
diff --git a/bsp/xuantie/xiaohui/r910/SConscript b/bsp/xuantie/xiaohui/r910/SConscript
index 20f7689c53..27c6c5f635 100644
--- a/bsp/xuantie/xiaohui/r910/SConscript
+++ b/bsp/xuantie/xiaohui/r910/SConscript
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
objs = []
list = os.listdir(cwd)
-for d in list:
- path = os.path.join(cwd, d)
- if os.path.isfile(os.path.join(path, 'SConscript')):
- objs = objs + SConscript(os.path.join(d, 'SConscript'))
+for item in list:
+ path = os.path.join(cwd, item)
+ if item == 'libraries' or not os.path.isdir(path):
+ continue
+
+ sconscript_path = os.path.join(path, 'SConscript')
+ if os.path.isfile(sconscript_path):
+ objs.extend(SConscript(os.path.join(item, 'SConscript')))
Return('objs')
diff --git a/bsp/xuantie/xiaohui/r910/rtconfig.py b/bsp/xuantie/xiaohui/r910/rtconfig.py
index d6c18b6358..cb92fb4d27 100644
--- a/bsp/xuantie/xiaohui/r910/rtconfig.py
+++ b/bsp/xuantie/xiaohui/r910/rtconfig.py
@@ -24,6 +24,8 @@ BUILD = 'debug'
CORE = 'risc-v'
MAP_FILE = 'rtthread.map'
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
+if os.path.exists('./libraries'):
+ LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
TARGET_NAME = 'rtthread.bin'
#------- GCC settings ----------------------------------------------------------
diff --git a/bsp/xuantie/xiaohui/r920/SConscript b/bsp/xuantie/xiaohui/r920/SConscript
index 20f7689c53..27c6c5f635 100644
--- a/bsp/xuantie/xiaohui/r920/SConscript
+++ b/bsp/xuantie/xiaohui/r920/SConscript
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
objs = []
list = os.listdir(cwd)
-for d in list:
- path = os.path.join(cwd, d)
- if os.path.isfile(os.path.join(path, 'SConscript')):
- objs = objs + SConscript(os.path.join(d, 'SConscript'))
+for item in list:
+ path = os.path.join(cwd, item)
+ if item == 'libraries' or not os.path.isdir(path):
+ continue
+
+ sconscript_path = os.path.join(path, 'SConscript')
+ if os.path.isfile(sconscript_path):
+ objs.extend(SConscript(os.path.join(item, 'SConscript')))
Return('objs')
diff --git a/bsp/xuantie/xiaohui/r920/rtconfig.py b/bsp/xuantie/xiaohui/r920/rtconfig.py
index e00c41fa99..a4c34019b6 100644
--- a/bsp/xuantie/xiaohui/r920/rtconfig.py
+++ b/bsp/xuantie/xiaohui/r920/rtconfig.py
@@ -24,6 +24,8 @@ BUILD = 'debug'
CORE = 'risc-v'
MAP_FILE = 'rtthread.map'
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
+if os.path.exists('./libraries'):
+ LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
TARGET_NAME = 'rtthread.bin'
#------- GCC settings ----------------------------------------------------------
@@ -92,6 +94,6 @@ if PLATFORM == 'gcc':
def dist_handle(BSP_ROOT, dist_dir):
import sys
cwd_path = os.getcwd()
- sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
+ sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
from sdk_dist import dist_do_building
dist_do_building(BSP_ROOT, dist_dir)