Skip to content

Commit f7b553b

Browse files
committed
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
2 parents 9756c77 + af95348 commit f7b553b

File tree

1,481 files changed

+26133
-394428
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,481 files changed

+26133
-394428
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ env:
138138
- RTT_BSP='xplorer4330/M4' RTT_TOOL_CHAIN='sourcery-arm'
139139
- RTT_BSP='at32/at32f403a-start' RTT_TOOL_CHAIN='sourcery-arm'
140140
- RTT_BSP='at32/at32f407-start' RTT_TOOL_CHAIN='sourcery-arm'
141+
- RTT_BSP='smartfusion2' RTT_TOOL_CHAIN='sourcery-arm'
141142

142143
stage: compile
143144
script:

bsp/CME_M7/applications/startup.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ void rtthread_startup(void)
4747
/* show version */
4848
rt_show_version();
4949

50-
/* init tick */
51-
rt_system_tick_init();
52-
53-
/* init kernel object */
54-
rt_system_object_init();
55-
5650
/* init timer system */
5751
rt_system_timer_init();
5852

bsp/allwinner_tina/drivers/spi/drv_spi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ static rt_err_t configure(struct rt_spi_device *device,
483483
SPI_SetFirstTransmitBit(spi, SPI_TCTRL_FBS_LSB);
484484
}
485485

486-
switch (configuration->mode)
486+
switch (configuration->mode & RT_SPI_MODE_3)
487487
{
488488
case RT_SPI_MODE_0:
489489
SPI_SetSclkMode(spi, SPI_SCLK_Mode0);

bsp/avr32uc3b0/startup.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ int main(void)
3030
#endif
3131

3232
rt_hw_board_init();
33-
rt_system_tick_init();
34-
rt_system_object_init();
3533
rt_system_timer_init();
3634

3735
#ifdef RT_USING_HEAP

bsp/bf533/startup.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ void rtthread_startup(void)
3535
/* show version */
3636
rt_show_version();
3737

38-
/* init tick */
39-
rt_system_tick_init();
40-
41-
/* init kernel object */
42-
rt_system_object_init();
43-
4438
/* init timer system */
4539
rt_system_timer_init();
4640

bsp/efm32/startup.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,6 @@ void rtthread_startup(void)
102102
/* show version */
103103
rt_show_version();
104104

105-
/* init tick */
106-
rt_system_tick_init();
107-
108-
/* init kernel object */
109-
rt_system_object_init();
110-
111105
/* init timer system */
112106
rt_system_timer_init();
113107

bsp/fh8620/platform/fh8620/iot_cam/startup.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,6 @@ void rtthread_startup(void)
9393
/* show version */
9494
rt_show_version();
9595

96-
/* initialize tick */
97-
rt_system_tick_init();
98-
99-
/* initialize kernel object */
100-
rt_system_object_init();
101-
10296
/* initialize timer system */
10397
rt_system_timer_init();
10498

bsp/frdm-k64f/applications/startup.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ void rtthread_startup(void)
6565
/* show version */
6666
rt_show_version();
6767

68-
/* init tick */
69-
rt_system_tick_init();
70-
71-
/* init kernel object */
72-
rt_system_object_init();
73-
7468
/* init timer system */
7569
rt_system_timer_init();
7670

bsp/gkipc/armv6/rtos_lib.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,14 +1095,9 @@ U32 RTOS_InitKernel(U32 Heap_size)
10951095
/* show version */
10961096
//rt_show_version();
10971097

1098-
/* initialize tick */
1099-
//rt_system_tick_init();
11001098
RTOS_HwTickInit();
11011099
//rt_kprintf("set tick\n");
11021100

1103-
/* initialize kernel object */
1104-
rt_system_object_init();
1105-
11061101
/* initialize timer system */
11071102
rt_system_timer_init();
11081103

bsp/imxrt/imxrt1052-nxp-evk/.config

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# RT-Thread Kernel
88
#
99
CONFIG_RT_NAME_MAX=8
10+
# CONFIG_RT_USING_ARCH_DATA_TYPE is not set
1011
# CONFIG_RT_USING_SMP is not set
1112
CONFIG_RT_ALIGN_SIZE=4
1213
# CONFIG_RT_THREAD_PRIORITY_8 is not set
@@ -63,7 +64,8 @@ CONFIG_RT_USING_DEVICE=y
6364
CONFIG_RT_USING_CONSOLE=y
6465
CONFIG_RT_CONSOLEBUF_SIZE=128
6566
CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
66-
CONFIG_RT_VER_NUM=0x40001
67+
CONFIG_RT_VER_NUM=0x40003
68+
# CONFIG_RT_USING_CPU_FFS is not set
6769
# CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set
6870

6971
#
@@ -108,30 +110,32 @@ CONFIG_FINSH_ARG_MAX=10
108110
#
109111
CONFIG_RT_USING_DEVICE_IPC=y
110112
CONFIG_RT_PIPE_BUFSZ=512
113+
# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set
111114
CONFIG_RT_USING_SERIAL=y
112115
# CONFIG_RT_SERIAL_USING_DMA is not set
113116
CONFIG_RT_SERIAL_RB_BUFSZ=64
114117
# CONFIG_RT_USING_CAN is not set
115118
# CONFIG_RT_USING_HWTIMER is not set
116119
CONFIG_RT_USING_CPUTIME=y
117120
# CONFIG_RT_USING_I2C is not set
121+
CONFIG_RT_USING_PHY=y
118122
CONFIG_RT_USING_PIN=y
119123
# CONFIG_RT_USING_ADC is not set
124+
# CONFIG_RT_USING_DAC is not set
120125
# CONFIG_RT_USING_PWM is not set
121126
# CONFIG_RT_USING_MTD_NOR is not set
122127
# CONFIG_RT_USING_MTD_NAND is not set
123-
# CONFIG_RT_USING_MTD is not set
124128
# CONFIG_RT_USING_PM is not set
125129
# CONFIG_RT_USING_RTC is not set
126130
# CONFIG_RT_USING_SDIO is not set
127131
# CONFIG_RT_USING_SPI is not set
128132
# CONFIG_RT_USING_WDT is not set
129133
# CONFIG_RT_USING_AUDIO is not set
130134
# CONFIG_RT_USING_SENSOR is not set
131-
132-
#
133-
# Using WiFi
134-
#
135+
# CONFIG_RT_USING_TOUCH is not set
136+
# CONFIG_RT_USING_HWCRYPTO is not set
137+
# CONFIG_RT_USING_PULSE_ENCODER is not set
138+
# CONFIG_RT_USING_INPUT_CAPTURE is not set
135139
# CONFIG_RT_USING_WIFI is not set
136140

137141
#
@@ -145,6 +149,7 @@ CONFIG_RT_USING_PIN=y
145149
#
146150
CONFIG_RT_USING_LIBC=y
147151
# CONFIG_RT_USING_PTHREADS is not set
152+
# CONFIG_RT_USING_MODULE is not set
148153

149154
#
150155
# Network
@@ -156,14 +161,25 @@ CONFIG_RT_USING_LIBC=y
156161
# CONFIG_RT_USING_SAL is not set
157162

158163
#
159-
# light weight TCP/IP stack
164+
# Network interface device
160165
#
161-
# CONFIG_RT_USING_LWIP is not set
166+
CONFIG_RT_USING_NETDEV=y
167+
CONFIG_NETDEV_USING_IFCONFIG=y
168+
CONFIG_NETDEV_USING_PING=y
169+
CONFIG_NETDEV_USING_NETSTAT=y
170+
CONFIG_NETDEV_USING_AUTO_DEFAULT=y
171+
# CONFIG_NETDEV_USING_IPV6 is not set
172+
CONFIG_NETDEV_IPV4=1
173+
CONFIG_NETDEV_IPV6=0
174+
# CONFIG_NETDEV_IPV6_SCOPES is not set
162175

163176
#
164-
# Modbus master and slave stack
177+
# light weight TCP/IP stack
165178
#
166-
# CONFIG_RT_USING_MODBUS is not set
179+
# CONFIG_RT_USING_LWIP is not set
180+
# CONFIG_RT_USING_LWIP141 is not set
181+
# CONFIG_RT_USING_LWIP202 is not set
182+
# CONFIG_RT_USING_LWIP212 is not set
167183

168184
#
169185
# AT commands
@@ -178,7 +194,6 @@ CONFIG_RT_USING_LIBC=y
178194
#
179195
# Utilities
180196
#
181-
# CONFIG_RT_USING_LOGTRACE is not set
182197
# CONFIG_RT_USING_RYM is not set
183198
# CONFIG_RT_USING_ULOG is not set
184199
# CONFIG_RT_USING_UTEST is not set
@@ -230,13 +245,12 @@ CONFIG_RT_USING_LIBC=y
230245
# CONFIG_PKG_USING_GAGENT_CLOUD is not set
231246
# CONFIG_PKG_USING_ALI_IOTKIT is not set
232247
# CONFIG_PKG_USING_AZURE is not set
233-
# CONFIG_PKG_USING_TENCENT_IOTHUB is not set
248+
# CONFIG_PKG_USING_TENCENT_IOTKIT is not set
234249
# CONFIG_PKG_USING_NIMBLE is not set
235250
# CONFIG_PKG_USING_OTA_DOWNLOADER is not set
236251
# CONFIG_PKG_USING_IPMSG is not set
237252
# CONFIG_PKG_USING_LSSDP is not set
238253
# CONFIG_PKG_USING_AIRKISS_OPEN is not set
239-
# CONFIG_PKG_USING_LIBRWS is not set
240254

241255
#
242256
# security packages
@@ -294,6 +308,7 @@ CONFIG_RT_USING_LIBC=y
294308
# CONFIG_PKG_USING_SENSORS_DRIVERS is not set
295309
# CONFIG_PKG_USING_REALTEK_AMEBA is not set
296310
# CONFIG_PKG_USING_SHT2X is not set
311+
# CONFIG_PKG_USING_AP3216C is not set
297312
# CONFIG_PKG_USING_STM32_SDIO is not set
298313
# CONFIG_PKG_USING_ICM20608 is not set
299314
# CONFIG_PKG_USING_U8G2 is not set
@@ -310,7 +325,6 @@ CONFIG_RT_USING_LIBC=y
310325
# CONFIG_PKG_USING_MOTIONDRIVER2RTT is not set
311326
# CONFIG_PKG_USING_AD7746 is not set
312327
# CONFIG_PKG_USING_PCA9685 is not set
313-
# CONFIG_PKG_USING_I2C_TOOLS is not set
314328

315329
#
316330
# miscellaneous packages
@@ -354,10 +368,13 @@ CONFIG_BSP_USING_LPUART=y
354368
CONFIG_BSP_USING_LPUART1=y
355369
# CONFIG_BSP_LPUART1_RX_USING_DMA is not set
356370
# CONFIG_BSP_LPUART1_TX_USING_DMA is not set
371+
# CONFIG_BSP_USING_LPUART3 is not set
357372

358373
#
359374
# Onboard Peripheral Drivers
360375
#
376+
# CONFIG_BSP_USING_SDRAM is not set
377+
# CONFIG_BSP_USING_ETH is not set
361378

362379
#
363380
# Board extended module Drivers

0 commit comments

Comments
 (0)