Skip to content

Commit d62f1e4

Browse files
YaochengerRbb666
Yaochenger
authored and
Rbb666
committed
[bsp/xuantie] 修复bsp的dist功能
1 parent b2ce955 commit d62f1e4

File tree

21 files changed

+126
-49
lines changed

21 files changed

+126
-49
lines changed

‎bsp/xuantie/smartl/e902/SConscript

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
77
objs = []
88
list = os.listdir(cwd)
99

10-
for d in list:
11-
path = os.path.join(cwd, d)
12-
if os.path.isfile(os.path.join(path, 'SConscript')):
13-
objs = objs + SConscript(os.path.join(d, 'SConscript'))
10+
for item in list:
11+
path = os.path.join(cwd, item)
12+
if item == 'libraries' or not os.path.isdir(path):
13+
continue
14+
15+
sconscript_path = os.path.join(path, 'SConscript')
16+
if os.path.isfile(sconscript_path):
17+
objs.extend(SConscript(os.path.join(item, 'SConscript')))
1418

1519
Return('objs')

‎bsp/xuantie/smartl/e902/rtconfig.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
CORE = 'risc-v'
2525
MAP_FILE = 'rtthread.map'
2626
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_smartl.ld'
27+
if os.path.exists('./libraries'):
28+
LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_smartl.ld'
2729
TARGET_NAME = 'rtthread.bin'
2830

2931
#------- GCC settings ----------------------------------------------------------
@@ -85,6 +87,6 @@
8587
def dist_handle(BSP_ROOT, dist_dir):
8688
import sys
8789
cwd_path = os.getcwd()
88-
sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
90+
sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
8991
from sdk_dist import dist_do_building
9092
dist_do_building(BSP_ROOT, dist_dir)

‎bsp/xuantie/smartl/e906/SConscript

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
77
objs = []
88
list = os.listdir(cwd)
99

10-
for d in list:
11-
path = os.path.join(cwd, d)
12-
if os.path.isfile(os.path.join(path, 'SConscript')):
13-
objs = objs + SConscript(os.path.join(d, 'SConscript'))
10+
for item in list:
11+
path = os.path.join(cwd, item)
12+
if item == 'libraries' or not os.path.isdir(path):
13+
continue
14+
15+
sconscript_path = os.path.join(path, 'SConscript')
16+
if os.path.isfile(sconscript_path):
17+
objs.extend(SConscript(os.path.join(item, 'SConscript')))
1418

1519
Return('objs')

‎bsp/xuantie/smartl/e906/rtconfig.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
CORE = 'risc-v'
2525
MAP_FILE = 'rtthread.map'
2626
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_smartl.ld'
27+
if os.path.exists('./libraries'):
28+
LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_smartl.ld'
2729
TARGET_NAME = 'rtthread.bin'
2830

2931
#------- GCC settings ----------------------------------------------------------
@@ -85,6 +87,6 @@
8587
def dist_handle(BSP_ROOT, dist_dir):
8688
import sys
8789
cwd_path = os.getcwd()
88-
sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
90+
sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
8991
from sdk_dist import dist_do_building
9092
dist_do_building(BSP_ROOT, dist_dir)

‎bsp/xuantie/smartl/e907/SConscript

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
77
objs = []
88
list = os.listdir(cwd)
99

10-
for d in list:
11-
path = os.path.join(cwd, d)
12-
if os.path.isfile(os.path.join(path, 'SConscript')):
13-
objs = objs + SConscript(os.path.join(d, 'SConscript'))
10+
for item in list:
11+
path = os.path.join(cwd, item)
12+
if item == 'libraries' or not os.path.isdir(path):
13+
continue
14+
15+
sconscript_path = os.path.join(path, 'SConscript')
16+
if os.path.isfile(sconscript_path):
17+
objs.extend(SConscript(os.path.join(item, 'SConscript')))
1418

1519
Return('objs')

‎bsp/xuantie/smartl/e907/rtconfig.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
CORE = 'risc-v'
2525
MAP_FILE = 'rtthread.map'
2626
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_smartl.ld'
27+
if os.path.exists('./libraries'):
28+
LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_smartl.ld'
2729
TARGET_NAME = 'rtthread.bin'
2830

2931
#------- GCC settings ----------------------------------------------------------
@@ -85,6 +87,6 @@
8587
def dist_handle(BSP_ROOT, dist_dir):
8688
import sys
8789
cwd_path = os.getcwd()
88-
sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
90+
sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
8991
from sdk_dist import dist_do_building
9092
dist_do_building(BSP_ROOT, dist_dir)

‎bsp/xuantie/tools/sdk_dist.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import os
2+
import sys
3+
import shutil
4+
5+
cwd_path = os.getcwd()
6+
sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools'))
7+
8+
# BSP dist function
9+
def dist_do_building(BSP_ROOT, dist_dir):
10+
from mkdist import bsp_copy_files
11+
import rtconfig
12+
13+
print(dist_dir)
14+
print("=> copy XUANTIE bsp library")
15+
library_dir = os.path.join(dist_dir, './libraries')
16+
library_path = os.path.join(os.path.dirname(BSP_ROOT), '../libraries')
17+
bsp_copy_files(library_path, library_dir)

‎bsp/xuantie/xiaohui/c906/SConscript

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
77
objs = []
88
list = os.listdir(cwd)
99

10-
for d in list:
11-
path = os.path.join(cwd, d)
12-
if os.path.isfile(os.path.join(path, 'SConscript')):
13-
objs = objs + SConscript(os.path.join(d, 'SConscript'))
10+
for item in list:
11+
path = os.path.join(cwd, item)
12+
if item == 'libraries' or not os.path.isdir(path):
13+
continue
14+
15+
sconscript_path = os.path.join(path, 'SConscript')
16+
if os.path.isfile(sconscript_path):
17+
objs.extend(SConscript(os.path.join(item, 'SConscript')))
1418

1519
Return('objs')

‎bsp/xuantie/xiaohui/c906/rtconfig.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
CORE = 'risc-v'
2525
MAP_FILE = 'rtthread.map'
2626
LINK_FILE = '../../libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
27+
if os.path.exists('./libraries'):
28+
LINK_FILE = './libraries/xuantie_libraries/chip_riscv_dummy/gcc_flash_xiaohui.ld'
2729
TARGET_NAME = 'rtthread.bin'
2830

2931
#------- GCC settings ----------------------------------------------------------
@@ -92,6 +94,6 @@
9294
def dist_handle(BSP_ROOT, dist_dir):
9395
import sys
9496
cwd_path = os.getcwd()
95-
sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
97+
sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), '../tools'))
9698
from sdk_dist import dist_do_building
9799
dist_do_building(BSP_ROOT, dist_dir)

‎bsp/xuantie/xiaohui/c907/SConscript

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ cwd = GetCurrentDir()
77
objs = []
88
list = os.listdir(cwd)
99

10-
for d in list:
11-
path = os.path.join(cwd, d)
12-
if os.path.isfile(os.path.join(path, 'SConscript')):
13-
objs = objs + SConscript(os.path.join(d, 'SConscript'))
10+
for item in list:
11+
path = os.path.join(cwd, item)
12+
if item == 'libraries' or not os.path.isdir(path):
13+
continue
14+
15+
sconscript_path = os.path.join(path, 'SConscript')
16+
if os.path.isfile(sconscript_path):
17+
objs.extend(SConscript(os.path.join(item, 'SConscript')))
1418

1519
Return('objs')

0 commit comments

Comments
 (0)