Skip to content

Commit 6bf76a3

Browse files
BernardXiongBernardXiong
committed
Merge branch 'master' into gitee_master
2 parents a0897d6 + fa599be commit 6bf76a3

File tree

1,334 files changed

+1370514
-8480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,334 files changed

+1370514
-8480
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ env:
4141
- RTT_BSP='lm3s8962' RTT_TOOL_CHAIN='sourcery-arm'
4242
- RTT_BSP='lm3s9b9x' RTT_TOOL_CHAIN='sourcery-arm'
4343
- RTT_BSP='lm4f232' RTT_TOOL_CHAIN='sourcery-arm'
44+
- RTT_BSP='tm4c123bsp' RTT_TOOL_CHAIN='sourcery-arm'
4445
- RTT_BSP='tm4c129x' RTT_TOOL_CHAIN='sourcery-arm'
4546
- RTT_BSP='lpc43xx/M4' RTT_TOOL_CHAIN='sourcery-arm'
4647
- RTT_BSP='lpc176x' RTT_TOOL_CHAIN='sourcery-arm'
@@ -104,13 +105,14 @@ env:
104105
- RTT_BSP='stm32/stm32f767-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'
105106
- RTT_BSP='stm32/stm32f767-fire-challenger' RTT_TOOL_CHAIN='sourcery-arm'
106107
- RTT_BSP='stm32/stm32f767-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
108+
- RTT_BSP='stm32/stm32g070-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
107109
- RTT_BSP='stm32/stm32g071-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
108110
- RTT_BSP='stm32/stm32g431-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
109111
- RTT_BSP='stm32/stm32h743-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'
110112
- RTT_BSP='stm32/stm32h743-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
111113
- RTT_BSP='stm32/stm32h747-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'
112114
- RTT_BSP='stm32/stm32l4r9-st-eval' RTT_TOOL_CHAIN='sourcery-arm'
113-
- RTT_BSP='stm32/stm32l010-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
115+
- RTT_BSP='stm32/stm32l010-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
114116
- RTT_BSP='stm32/stm32l053-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
115117
- RTT_BSP='stm32/stm32l412-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
116118
- RTT_BSP='stm32/stm32l432-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
@@ -120,6 +122,7 @@ env:
120122
- RTT_BSP='stm32/stm32l476-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
121123
- RTT_BSP='stm32/stm32l496-ali-developer' RTT_TOOL_CHAIN='sourcery-arm'
122124
- RTT_BSP='stm32/stm32l496-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
125+
- RTT_BSP='stm32/stm32mp157a-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'
123126
- RTT_BSP='stm32f20x' RTT_TOOL_CHAIN='sourcery-arm'
124127
- RTT_BSP='swm320-lq100' RTT_TOOL_CHAIN='sourcery-arm'
125128
# - RTT_BSP='taihu' RTT_TOOL_CHAIN='sourcery-ppc'

‎bsp/at32/at32f403a-start/rtconfig.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import os
2-
import sys
32

43
# toolchains options
54
ARCH='arm'
@@ -143,8 +142,9 @@
143142
EXEC_PATH = EXEC_PATH + '/arm/bin/'
144143
POST_ACTION = 'ielftool --bin $TARGET rtthread.bin'
145144

146-
def dist_handle(BSP_ROOT):
145+
def dist_handle(BSP_ROOT, dist_dir):
146+
import sys
147147
cwd_path = os.getcwd()
148148
sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
149149
from sdk_dist import dist_do_building
150-
dist_do_building(BSP_ROOT)
150+
dist_do_building(BSP_ROOT, dist_dir)

‎bsp/at32/at32f407-start/rtconfig.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,10 @@
141141

142142
EXEC_PATH = EXEC_PATH + '/arm/bin/'
143143
POST_ACTION = 'ielftool --bin $TARGET rtthread.bin'
144+
145+
def dist_handle(BSP_ROOT, dist_dir):
146+
import sys
147+
cwd_path = os.getcwd()
148+
sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
149+
from sdk_dist import dist_do_building
150+
dist_do_building(BSP_ROOT, dist_dir)

‎bsp/at32/tools/sdk_dist.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools'))
66

77
# BSP dist function
8-
def dist_do_building(BSP_ROOT):
8+
def dist_do_building(BSP_ROOT, dist_dir):
99
from mkdist import bsp_copy_files
1010
import rtconfig
11-
12-
dist_dir = os.path.join(BSP_ROOT, 'dist', os.path.basename(BSP_ROOT))
11+
12+
print("=> copy at32 bsp library")
13+
library_dir = os.path.join(dist_dir, 'Libraries')
1314
library_path = os.path.join(os.path.dirname(BSP_ROOT), 'Libraries')
14-
library_dir = os.path.join(dist_dir, 'Libraries')
15+
bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE),
16+
os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE))
17+
1518
print("=> copy bsp drivers")
1619
bsp_copy_files(os.path.join(library_path, 'rt_drivers'), os.path.join(library_dir, 'rt_drivers'))
17-
print("=> copy bsp library")
18-
bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE), os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE))
1920
shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))

‎bsp/efm32/copy_this_file_shell.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ int isprint(unsigned char ch)
8888

8989
#if defined(RT_USING_DFS) && defined(DFS_USING_WORKDIR)
9090
#include <dfs_posix.h>
91-
const char* finsh_get_prompt()
91+
const char* finsh_get_prompt(void)
9292
{
9393
#define _PROMPT "finsh "
9494
static char finsh_prompt[RT_CONSOLEBUF_SIZE + 1] = {_PROMPT};

‎bsp/gd32vf103v-eval/board/Kconfig‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ endmenu
1616

1717
menu "On-chip Peripheral Drivers"
1818

19+
config BSP_USING_GPIO
20+
bool "Enable GPIO"
21+
select RT_USING_PIN
22+
default y
23+
1924
menuconfig BSP_USING_UART
2025
bool "Enable USART"
2126
default y
@@ -24,7 +29,8 @@ menu "On-chip Peripheral Drivers"
2429
config BSP_USING_UART0
2530
bool "Enable USART0"
2631
default y
27-
endif
32+
endif
33+
2834
endmenu
2935

3036
menu "Board extended module Drivers"

0 commit comments

Comments
 (0)