瀏覽代碼

fix the scons --dist

supperthomas 3 年之前
父節點
當前提交
33a3f835ad
共有 2 個文件被更改,包括 6 次插入3 次删除
  1. 4 2
      bsp/lpc55sxx/lpc55s69_nxp_evk/SConstruct
  2. 2 1
      bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py

+ 4 - 2
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)

+ 2 - 1
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