From e1bd3673fd428ffbfd04d2f51a1a9be6fbfe832d Mon Sep 17 00:00:00 2001
From: luhuadong <luhuadong@163.com>
Date: Wed, 22 Apr 2020 16:58:10 +0800
Subject: [PATCH] [AT32 BSP] do bsp special dist handle

---
 bsp/at32/at32f403a-start/Kconfig     |  3 +--
 bsp/at32/at32f403a-start/rtconfig.py |  7 +++++++
 bsp/at32/tools/sdk_dist.py           | 19 +++++++++++++++++++
 tools/mkdist.py                      | 18 ------------------
 4 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 bsp/at32/tools/sdk_dist.py

diff --git a/bsp/at32/at32f403a-start/Kconfig b/bsp/at32/at32f403a-start/Kconfig
index 7a400db91f..1a3b4b75bc 100644
--- a/bsp/at32/at32f403a-start/Kconfig
+++ b/bsp/at32/at32f403a-start/Kconfig
@@ -17,6 +17,5 @@ config PKGS_DIR
 
 source "$RTT_DIR/Kconfig"
 source "$PKGS_DIR/Kconfig"
-source "../libraries/Kconfig"
+source "../Libraries/Kconfig"
 source "board/Kconfig"
-
diff --git a/bsp/at32/at32f403a-start/rtconfig.py b/bsp/at32/at32f403a-start/rtconfig.py
index 4800f9a871..5f2f01ca76 100644
--- a/bsp/at32/at32f403a-start/rtconfig.py
+++ b/bsp/at32/at32f403a-start/rtconfig.py
@@ -1,4 +1,5 @@
 import os
+import sys
 
 # toolchains options
 ARCH='arm'
@@ -141,3 +142,9 @@ elif PLATFORM == 'iar':
 
     EXEC_PATH = EXEC_PATH + '/arm/bin/'
     POST_ACTION = 'ielftool --bin $TARGET rtthread.bin'
+
+def dist_handle(BSP_ROOT):
+    cwd_path = os.getcwd()
+    sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
+    from sdk_dist import dist_do_building
+    dist_do_building(BSP_ROOT)
diff --git a/bsp/at32/tools/sdk_dist.py b/bsp/at32/tools/sdk_dist.py
new file mode 100644
index 0000000000..01ff930b20
--- /dev/null
+++ b/bsp/at32/tools/sdk_dist.py
@@ -0,0 +1,19 @@
+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):
+    from mkdist import bsp_copy_files
+    import rtconfig
+    
+    dist_dir  = os.path.join(BSP_ROOT, 'dist', os.path.basename(BSP_ROOT))
+    library_path = os.path.join(os.path.dirname(BSP_ROOT), 'Libraries')
+    library_dir  = os.path.join(dist_dir, 'Libraries')
+    print("=> copy bsp drivers")
+    bsp_copy_files(os.path.join(library_path, 'rt_drivers'), os.path.join(library_dir, 'rt_drivers'))
+    print("=> copy bsp library")
+    bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE), os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE))
+    shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))
diff --git a/tools/mkdist.py b/tools/mkdist.py
index 2f12ad8f12..d83020f755 100644
--- a/tools/mkdist.py
+++ b/tools/mkdist.py
@@ -214,15 +214,6 @@ 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:
         print("=> start dist handle")
@@ -354,15 +345,6 @@ 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'))
-
     # copy nuclei bsp libiary files
     if os.path.basename(os.path.dirname(BSP_ROOT)) == 'nuclei':
         print("=> copy nuclei bsp library")