From 33a3f835ad21e794137ff310badf46c1700a0d1b Mon Sep 17 00:00:00 2001
From: supperthomas <78900636@qq.com>
Date: Sat, 23 Oct 2021 14:57:34 +0800
Subject: [PATCH] fix the scons --dist

---
 bsp/lpc55sxx/lpc55s69_nxp_evk/SConstruct  | 6 ++++--
 bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/SConstruct b/bsp/lpc55sxx/lpc55s69_nxp_evk/SConstruct
index 36bd607bd6..8e331f9dd8 100644
--- a/bsp/lpc55sxx/lpc55s69_nxp_evk/SConstruct
+++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/SConstruct
@@ -58,8 +58,10 @@ Export('SDK_LIB')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 
-objs = objs + SConscript('../Libraries/drivers/SConscript')
-objs = objs + SConscript('../Libraries/LPC55S6X/SConscript')
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript')))
+
+# include cmsis
+objs.extend(SConscript(os.path.join(libraries_path_prefix, rtconfig.BSP_LIBRARY_TYPE, 'SConscript')))
 
 # make a building
 DoBuilding(TARGET, objs)
diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py
index 70c4c80b61..ef06621096 100644
--- a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py
+++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py
@@ -6,6 +6,7 @@ ARCH='arm'
 CPU='cortex-m4'
 CROSS_TOOL='gcc'
 BOARD_NAME = 'lpcxpresso'
+BSP_LIBRARY_TYPE = 'LPC55S6X'
 
 if os.getenv('RTT_CC'):
     CROSS_TOOL = os.getenv('RTT_CC')
@@ -153,7 +154,7 @@ elif PLATFORM == 'iar':
     EXEC_PATH = EXEC_PATH + '/arm/bin/'
     POST_ACTION = 'ielftool --bin $TARGET rtthread.bin'
 
-def dist_handle(BSP_ROOT):
+def dist_handle(BSP_ROOT, dist_dir):
     cwd_path = os.getcwd()
     sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
     from sdk_dist import dist_do_building
-- 
GitLab