diff options
| author | Meco Jianting Man <[email protected]> | 2021-03-31 22:02:17 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-03-31 22:02:17 +0800 |
| commit | c18cd58e3e9b70f412097534313cf5a76fca12a6 (patch) | |
| tree | bdd25e6da3252fc068ae76a593a8269bab9cc58f | |
| parent | ebe9d15d6f3760455e479546c829b7a4e25cddba (diff) | |
| parent | 08a4de57e2f5e2f0d770b569690616599eaaf5fe (diff) | |
Merge pull request #33 from RT-Thread/master
pr
| -rw-r--r-- | bsp/nrf5x/nrf52832/rtconfig.py | 8 | ||||
| -rw-r--r-- | bsp/nrf5x/nrf52840/rtconfig.py | 8 | ||||
| -rw-r--r-- | bsp/nrf5x/tools/sdk_dist.py | 17 | ||||
| -rw-r--r-- | components/drivers/serial/serial.c | 2 |
4 files changed, 34 insertions, 1 deletions
diff --git a/bsp/nrf5x/nrf52832/rtconfig.py b/bsp/nrf5x/nrf52832/rtconfig.py index 3be0db8de1..e8a959bc85 100644 --- a/bsp/nrf5x/nrf52832/rtconfig.py +++ b/bsp/nrf5x/nrf52832/rtconfig.py @@ -84,3 +84,11 @@ elif PLATFORM == 'armcc': CFLAGS += ' -O2' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' + + +def dist_handle(BSP_ROOT, dist_dir): + import sys + 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_dir) diff --git a/bsp/nrf5x/nrf52840/rtconfig.py b/bsp/nrf5x/nrf52840/rtconfig.py index 219d20d303..4ef29e332f 100644 --- a/bsp/nrf5x/nrf52840/rtconfig.py +++ b/bsp/nrf5x/nrf52840/rtconfig.py @@ -82,3 +82,11 @@ elif PLATFORM == 'armcc': CFLAGS += ' -O2' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' + + +def dist_handle(BSP_ROOT, dist_dir): + import sys + 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_dir) diff --git a/bsp/nrf5x/tools/sdk_dist.py b/bsp/nrf5x/tools/sdk_dist.py new file mode 100644 index 0000000000..d9fe5aa1f8 --- /dev/null +++ b/bsp/nrf5x/tools/sdk_dist.py @@ -0,0 +1,17 @@ +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, dist_dir): + from mkdist import bsp_copy_files + import rtconfig + + library_dir = os.path.join(dist_dir, 'libraries') + + print("=> copy nrf52 bsp libraries") + library_path = os.path.join(os.path.dirname(BSP_ROOT), 'libraries') + + bsp_copy_files(library_path, library_dir) diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c index d9a20f05a0..32161ad0cb 100644 --- a/components/drivers/serial/serial.c +++ b/components/drivers/serial/serial.c @@ -816,11 +816,11 @@ static rt_err_t rt_serial_close(struct rt_device *dev) /* configure low level device */ serial->ops->control(serial, RT_DEVICE_CTRL_CLR_INT, (void *) RT_DEVICE_FLAG_DMA_TX); } +#endif /* RT_SERIAL_USING_DMA */ serial->ops->control(serial, RT_DEVICE_CTRL_CLOSE, RT_NULL); dev->flag &= ~RT_DEVICE_FLAG_ACTIVATED; -#endif /* RT_SERIAL_USING_DMA */ return RT_EOK; } |