summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluhuadong <[email protected]>2020-04-17 22:14:37 +0800
committerluhuadong <[email protected]>2020-04-17 22:14:37 +0800
commit3b2fa472096d41287ee8cb542e8c1d119a5a8b76 (patch)
treef00ab4a93065bdb80fa8aec57757d2939e969424
parentf406aab4d24a055b51f5592d92ca8ed1beb1cfe6 (diff)
[BSP] add Libraries when scons --dist
-rw-r--r--bsp/at32/at32f403a-start/rtconfig.py6
-rw-r--r--tools/mkdist.py26
2 files changed, 25 insertions, 7 deletions
diff --git a/bsp/at32/at32f403a-start/rtconfig.py b/bsp/at32/at32f403a-start/rtconfig.py
index 1d63cabb96..4800f9a871 100644
--- a/bsp/at32/at32f403a-start/rtconfig.py
+++ b/bsp/at32/at32f403a-start/rtconfig.py
@@ -57,7 +57,7 @@ if PLATFORM == 'gcc':
else:
CFLAGS += ' -O2'
- CXXFLAGS = CFLAGS
+ CXXFLAGS = CFLAGS
POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
@@ -88,7 +88,7 @@ elif PLATFORM == 'armcc':
else:
CFLAGS += ' -O2'
- CXXFLAGS = CFLAGS
+ CXXFLAGS = CFLAGS
CFLAGS += ' -std=c99'
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
@@ -136,7 +136,7 @@ elif PLATFORM == 'iar':
LFLAGS = ' --config "board/linker_scripts/link.icf"'
LFLAGS += ' --entry __iar_program_start'
-
+
CXXFLAGS = CFLAGS
EXEC_PATH = EXEC_PATH + '/arm/bin/'
diff --git a/tools/mkdist.py b/tools/mkdist.py
index 7e4b9a8bbe..e71d767446 100644
--- a/tools/mkdist.py
+++ b/tools/mkdist.py
@@ -122,7 +122,7 @@ def bsp_update_kconfig(dist_dir):
line = line[0:position] + 'default "rt-thread"\n'
found = 0
f.write(line)
-
+
def bsp_update_kconfig_library(dist_dir):
# change RTT_ROOT in Kconfig
if not os.path.isfile(os.path.join(dist_dir, 'Kconfig')):
@@ -141,7 +141,7 @@ def bsp_update_kconfig_library(dist_dir):
found = 0
f.write(line)
- # change board/kconfig path
+ # change board/kconfig path
if not os.path.isfile(os.path.join(dist_dir, 'board/Kconfig')):
return
@@ -214,12 +214,21 @@ def MkDist_Strip(program, BSP_ROOT, RTT_ROOT, Env):
bsp_copy_files(os.path.join(library_path, Env['bsp_lib_type']), os.path.join(library_dir, Env['bsp_lib_type']))
shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))
+ # copy at32 bsp libiary files
+ if os.path.basename(os.path.dirname(BSP_ROOT)) == 'at32':
+ print("=> copy at32 bsp library")
+ library_path = os.path.join(os.path.dirname(BSP_ROOT), 'Libraries')
+ library_dir = os.path.join(dist_dir, 'Libraries')
+ bsp_copy_files(os.path.join(library_path, 'rt_drivers'), os.path.join(library_dir, 'rt_drivers'))
+ bsp_copy_files(os.path.join(library_path, 'AT32_Std_Driver'), os.path.join(library_dir, 'AT32_Std_Driver'))
+ shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))
+
# do bsp special dist handle
- if 'dist_handle' in Env:
+ if 'dist_handle' in Env:
print("=> start dist handle")
dist_handle = Env['dist_handle']
dist_handle(BSP_ROOT)
-
+
# get all source files from program
for item in program:
walk_children(item)
@@ -345,6 +354,15 @@ def MkDist(program, BSP_ROOT, RTT_ROOT, Env, rttide = None):
bsp_copy_files(os.path.join(library_path, Env['bsp_lib_type']), os.path.join(library_dir, Env['bsp_lib_type']))
shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))
+ # copy at32 bsp libiary files
+ if os.path.basename(os.path.dirname(BSP_ROOT)) == 'at32':
+ print("=> copy at32 bsp library")
+ library_path = os.path.join(os.path.dirname(BSP_ROOT), 'Libraries')
+ library_dir = os.path.join(dist_dir, 'Libraries')
+ bsp_copy_files(os.path.join(library_path, 'rt_drivers'), os.path.join(library_dir, 'rt_drivers'))
+ bsp_copy_files(os.path.join(library_path, 'AT32_Std_Driver'), os.path.join(library_dir, 'AT32_Std_Driver'))
+ shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))
+
# do bsp special dist handle
if 'dist_handle' in Env:
print("=> start dist handle")