summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguozhanxin <[email protected]>2022-03-30 19:17:17 +0800
committerguo <[email protected]>2022-04-01 00:09:31 +0800
commitb10761c09dfee22150e5abded0c4b7a94a8a19e3 (patch)
treed951722c943f9ebaab4e88a163b6423276d4ca4e
parent201bd8871dff1efd1f48bdfd01a1938e4547ffd5 (diff)
[bsp]Fix issue that dist cannot specify a directory
-rw-r--r--bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py2
-rw-r--r--bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.py6
-rw-r--r--bsp/lpc55sxx/tools/sdk_dist.py3
3 files changed, 5 insertions, 6 deletions
diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py
index ef06621096..1f394bbcea 100644
--- a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py
+++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py
@@ -158,5 +158,5 @@ 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
- dist_do_building(BSP_ROOT)
+ dist_do_building(BSP_ROOT, dist_dir)
diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.py b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.py
index 70c4c80b61..cfed933ffa 100644
--- a/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.py
+++ b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.py
@@ -46,7 +46,7 @@ if PLATFORM == 'gcc':
DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections'
CFLAGS = DEVICE + ' -Wall -D__FPU_PRESENT -eentry'
AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb -D__START=entry'
- LFLAGS = DEVICE + ' -lm -lgcc -lc' + ' -nostartfiles -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/LPC55S69_cm33_core0_flash.ld'
+ LFLAGS = DEVICE + ' -lm -lgcc -lc' + ' -nostartfiles -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T ../lpc55s69_nxp_evk/board/linker_scripts/LPC55S69_cm33_core0_flash.ld'
CPATH = ''
LPATH = ''
@@ -153,9 +153,9 @@ 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
- dist_do_building(BSP_ROOT)
+ dist_do_building(BSP_ROOT, dist_dir)
diff --git a/bsp/lpc55sxx/tools/sdk_dist.py b/bsp/lpc55sxx/tools/sdk_dist.py
index a69c8f2db1..c0e3097dcc 100644
--- a/bsp/lpc55sxx/tools/sdk_dist.py
+++ b/bsp/lpc55sxx/tools/sdk_dist.py
@@ -5,11 +5,10 @@ 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):
+def dist_do_building(BSP_ROOT, dist_dir):
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")