Skip to content

Commit c3e20fd

Browse files
committed
Merge branch 'master' of github.com:ShermanShao/rt-thread
2 parents a42cc7f + 92cf02a commit c3e20fd

File tree

176 files changed

+16092
-643
lines changed

Some content is hidden

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

176 files changed

+16092
-643
lines changed

bsp/ls1cdev/.config

Lines changed: 72 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# RT-Thread Kernel
88
#
99
CONFIG_RT_NAME_MAX=10
10+
# CONFIG_RT_USING_BIG_ENDIAN is not set
1011
# CONFIG_RT_USING_ARCH_DATA_TYPE is not set
1112
# CONFIG_RT_USING_SMP is not set
1213
CONFIG_RT_ALIGN_SIZE=8
@@ -19,7 +20,7 @@ CONFIG_RT_USING_OVERFLOW_CHECK=y
1920
CONFIG_RT_USING_HOOK=y
2021
CONFIG_RT_USING_IDLE_HOOK=y
2122
CONFIG_RT_IDLE_HOOK_LIST_SIZE=4
22-
CONFIG_IDLE_THREAD_STACK_SIZE=1024
23+
CONFIG_IDLE_THREAD_STACK_SIZE=8192
2324
# CONFIG_RT_USING_TIMER_SOFT is not set
2425

2526
#
@@ -28,6 +29,9 @@ CONFIG_IDLE_THREAD_STACK_SIZE=1024
2829
# CONFIG_RT_KSERVICE_USING_STDLIB is not set
2930
# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set
3031
# CONFIG_RT_USING_ASM_MEMCPY is not set
32+
# CONFIG_RT_USING_ASM_MEMSET is not set
33+
# CONFIG_RT_USING_TINY_FFS is not set
34+
# CONFIG_RT_PRINTF_LONGLONG is not set
3135
CONFIG_RT_DEBUG=y
3236
CONFIG_RT_DEBUG_COLOR=y
3337
# CONFIG_RT_DEBUG_INIT_CONFIG is not set
@@ -73,8 +77,7 @@ CONFIG_RT_USING_INTERRUPT_INFO=y
7377
CONFIG_RT_USING_CONSOLE=y
7478
CONFIG_RT_CONSOLEBUF_SIZE=128
7579
CONFIG_RT_CONSOLE_DEVICE_NAME="uart2"
76-
# CONFIG_RT_PRINTF_LONGLONG is not set
77-
CONFIG_RT_VER_NUM=0x40004
80+
CONFIG_RT_VER_NUM=0x40100
7881
# CONFIG_RT_USING_CPU_FFS is not set
7982
# CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set
8083

@@ -83,8 +86,9 @@ CONFIG_RT_VER_NUM=0x40004
8386
#
8487
CONFIG_RT_USING_COMPONENTS_INIT=y
8588
CONFIG_RT_USING_USER_MAIN=y
86-
CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048
89+
CONFIG_RT_MAIN_THREAD_STACK_SIZE=8192
8790
CONFIG_RT_MAIN_THREAD_PRIORITY=10
91+
# CONFIG_RT_USING_LEGACY is not set
8892

8993
#
9094
# C++ features
@@ -99,7 +103,7 @@ CONFIG_RT_USING_MSH=y
99103
CONFIG_FINSH_USING_MSH=y
100104
CONFIG_FINSH_THREAD_NAME="tshell"
101105
CONFIG_FINSH_THREAD_PRIORITY=20
102-
CONFIG_FINSH_THREAD_STACK_SIZE=4096
106+
CONFIG_FINSH_THREAD_STACK_SIZE=8192
103107
CONFIG_FINSH_USING_HISTORY=y
104108
CONFIG_FINSH_HISTORY_LINES=5
105109
CONFIG_FINSH_USING_SYMTAB=y
@@ -114,6 +118,7 @@ CONFIG_FINSH_ARG_MAX=10
114118
# Device virtual file system
115119
#
116120
CONFIG_RT_USING_DFS=y
121+
CONFIG_DFS_USING_POSIX=y
117122
CONFIG_DFS_USING_WORKDIR=y
118123
CONFIG_DFS_FILESYSTEMS_MAX=2
119124
CONFIG_DFS_FILESYSTEM_TYPES_MAX=2
@@ -141,6 +146,7 @@ CONFIG_RT_DFS_ELM_DRIVES=2
141146
CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512
142147
# CONFIG_RT_DFS_ELM_USE_ERASE is not set
143148
CONFIG_RT_DFS_ELM_REENTRANT=y
149+
CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000
144150
CONFIG_RT_USING_DFS_DEVFS=y
145151
# CONFIG_RT_USING_DFS_ROMFS is not set
146152
# CONFIG_RT_USING_DFS_RAMFS is not set
@@ -193,23 +199,28 @@ CONFIG_RT_USING_SPI_MSD=y
193199
#
194200
# Using USB
195201
#
202+
# CONFIG_RT_USING_USB is not set
196203
# CONFIG_RT_USING_USB_HOST is not set
197204
# CONFIG_RT_USING_USB_DEVICE is not set
198205

199206
#
200207
# POSIX layer and C standard library
201208
#
202209
CONFIG_RT_USING_LIBC=y
203-
CONFIG_RT_USING_PTHREADS=y
204-
CONFIG_PTHREAD_NUM_MAX=8
205-
CONFIG_RT_USING_POSIX=y
206-
# CONFIG_RT_USING_POSIX_MMAP is not set
207-
# CONFIG_RT_USING_POSIX_TERMIOS is not set
208-
# CONFIG_RT_USING_POSIX_GETLINE is not set
209-
# CONFIG_RT_USING_POSIX_AIO is not set
210+
CONFIG_RT_LIBC_USING_TIME=y
211+
# CONFIG_RT_LIBC_USING_FILEIO is not set
210212
# CONFIG_RT_USING_MODULE is not set
211213
CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
212214

215+
#
216+
# POSIX (Portable Operating System Interface) layer
217+
#
218+
# CONFIG_RT_USING_POSIX_FS is not set
219+
# CONFIG_RT_USING_POSIX_DELAY is not set
220+
# CONFIG_RT_USING_POSIX_GETLINE is not set
221+
CONFIG_RT_USING_PTHREADS=y
222+
CONFIG_PTHREAD_NUM_MAX=8
223+
213224
#
214225
# Network
215226
#
@@ -262,11 +273,11 @@ CONFIG_RT_LWIP_TCP_SND_BUF=4096
262273
CONFIG_RT_LWIP_TCP_WND=2048
263274
CONFIG_RT_LWIP_TCPTHREAD_PRIORITY=12
264275
CONFIG_RT_LWIP_TCPTHREAD_MBOX_SIZE=8
265-
CONFIG_RT_LWIP_TCPTHREAD_STACKSIZE=4096
276+
CONFIG_RT_LWIP_TCPTHREAD_STACKSIZE=8192
266277
# CONFIG_LWIP_NO_RX_THREAD is not set
267278
# CONFIG_LWIP_NO_TX_THREAD is not set
268279
CONFIG_RT_LWIP_ETHTHREAD_PRIORITY=14
269-
CONFIG_RT_LWIP_ETHTHREAD_STACKSIZE=512
280+
CONFIG_RT_LWIP_ETHTHREAD_STACKSIZE=8192
270281
CONFIG_RT_LWIP_ETHTHREAD_MBOX_SIZE=8
271282
# CONFIG_RT_LWIP_REASSEMBLY_FRAG is not set
272283
CONFIG_LWIP_NETIF_STATUS_CALLBACK=1
@@ -300,6 +311,7 @@ CONFIG_RT_LWIP_USING_PING=y
300311
# CONFIG_RT_USING_RYM is not set
301312
# CONFIG_RT_USING_ULOG is not set
302313
# CONFIG_RT_USING_UTEST is not set
314+
# CONFIG_RT_USING_VAR_EXPORT is not set
303315
# CONFIG_RT_USING_RT_LINK is not set
304316

305317
#
@@ -401,12 +413,17 @@ CONFIG_RT_LWIP_USING_PING=y
401413
# CONFIG_PKG_USING_AGILE_FTP is not set
402414
# CONFIG_PKG_USING_EMBEDDEDPROTO is not set
403415
# CONFIG_PKG_USING_RT_LINK_HW is not set
416+
# CONFIG_PKG_USING_LORA_PKT_FWD is not set
417+
# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set
418+
# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set
419+
# CONFIG_PKG_USING_HM is not set
420+
# CONFIG_PKG_USING_SMALL_MODBUS is not set
404421

405422
#
406423
# security packages
407424
#
408425
# CONFIG_PKG_USING_MBEDTLS is not set
409-
# CONFIG_PKG_USING_libsodium is not set
426+
# CONFIG_PKG_USING_LIBSODIUM is not set
410427
# CONFIG_PKG_USING_TINYCRYPT is not set
411428
# CONFIG_PKG_USING_TFM is not set
412429
# CONFIG_PKG_USING_YD_CRYPTO is not set
@@ -422,6 +439,18 @@ CONFIG_RT_LWIP_USING_PING=y
422439
#
423440
# multimedia packages
424441
#
442+
443+
#
444+
# LVGL: powerful and easy-to-use embedded GUI library
445+
#
446+
# CONFIG_PKG_USING_LVGL is not set
447+
# CONFIG_PKG_USING_LITTLEVGL2RTT is not set
448+
449+
#
450+
# u8g2: a monochrome graphic library
451+
#
452+
# CONFIG_PKG_USING_U8G2_OFFICIAL is not set
453+
# CONFIG_PKG_USING_U8G2 is not set
425454
# CONFIG_PKG_USING_OPENMV is not set
426455
# CONFIG_PKG_USING_MUPDF is not set
427456
# CONFIG_PKG_USING_STEMWIN is not set
@@ -434,6 +463,13 @@ CONFIG_RT_LWIP_USING_PING=y
434463
# CONFIG_PKG_USING_NUEMWIN is not set
435464
# CONFIG_PKG_USING_MP3PLAYER is not set
436465
# CONFIG_PKG_USING_TINYJPEG is not set
466+
# CONFIG_PKG_USING_UGUI is not set
467+
468+
#
469+
# PainterEngine: A cross-platform graphics application framework written in C language
470+
#
471+
# CONFIG_PKG_USING_PAINTERENGINE is not set
472+
# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set
437473

438474
#
439475
# tools packages
@@ -476,19 +512,33 @@ CONFIG_RT_LWIP_USING_PING=y
476512
# CONFIG_PKG_USING_MEM_SANDBOX is not set
477513
# CONFIG_PKG_USING_SOLAR_TERMS is not set
478514
# CONFIG_PKG_USING_GAN_ZHI is not set
515+
# CONFIG_PKG_USING_FDT is not set
479516

480517
#
481518
# system packages
482519
#
483520

484521
#
485-
# acceleration: Assembly language or algorithmic acceleration packages
522+
# enhanced kernel services
486523
#
487524
# CONFIG_PKG_USING_RT_MEMCPY_CM is not set
525+
# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
526+
# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set
527+
528+
#
529+
# acceleration: Assembly language or algorithmic acceleration packages
530+
#
488531
# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set
489532
# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set
490533
# CONFIG_PKG_USING_QFPLIB_M3 is not set
491534

535+
#
536+
# CMSIS: ARM Cortex-M Microcontroller Software Interface Standard
537+
#
538+
# CONFIG_PKG_USING_CMSIS_5 is not set
539+
# CONFIG_PKG_USING_CMSIS_5_AUX is not set
540+
# CONFIG_PKG_USING_CMSIS_RTOS2 is not set
541+
492542
#
493543
# Micrium: Micrium software products porting for RT-Thread
494544
#
@@ -506,8 +556,6 @@ CONFIG_RT_LWIP_USING_PING=y
506556
# CONFIG_PKG_USING_FLASHDB is not set
507557
# CONFIG_PKG_USING_SQLITE is not set
508558
# CONFIG_PKG_USING_RTI is not set
509-
# CONFIG_PKG_USING_LITTLEVGL2RTT is not set
510-
# CONFIG_PKG_USING_CMSIS is not set
511559
# CONFIG_PKG_USING_DFS_YAFFS is not set
512560
# CONFIG_PKG_USING_LITTLEFS is not set
513561
# CONFIG_PKG_USING_DFS_JFFS2 is not set
@@ -524,13 +572,14 @@ CONFIG_RT_LWIP_USING_PING=y
524572
# CONFIG_PKG_USING_QBOOT is not set
525573
# CONFIG_PKG_USING_PPOOL is not set
526574
# CONFIG_PKG_USING_OPENAMP is not set
527-
# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
528575
# CONFIG_PKG_USING_LPM is not set
529576
# CONFIG_PKG_USING_TLSF is not set
530577
# CONFIG_PKG_USING_EVENT_RECORDER is not set
531578
# CONFIG_PKG_USING_ARM_2D is not set
532579
# CONFIG_PKG_USING_WCWIDTH is not set
533580
# CONFIG_PKG_USING_MCUBOOT is not set
581+
# CONFIG_PKG_USING_TINYUSB is not set
582+
# CONFIG_PKG_USING_USB_STACK is not set
534583

535584
#
536585
# peripheral libraries and drivers
@@ -542,7 +591,6 @@ CONFIG_RT_LWIP_USING_PING=y
542591
# CONFIG_PKG_USING_AS7341 is not set
543592
# CONFIG_PKG_USING_STM32_SDIO is not set
544593
# CONFIG_PKG_USING_ICM20608 is not set
545-
# CONFIG_PKG_USING_U8G2 is not set
546594
# CONFIG_PKG_USING_BUTTON is not set
547595
# CONFIG_PKG_USING_PCF8574 is not set
548596
# CONFIG_PKG_USING_SX12XX is not set
@@ -604,6 +652,10 @@ CONFIG_RT_LWIP_USING_PING=y
604652
# CONFIG_PKG_USING_MCP23008 is not set
605653
# CONFIG_PKG_USING_BLUETRUM_SDK is not set
606654
# CONFIG_PKG_USING_MISAKA_AT24CXX is not set
655+
# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set
656+
# CONFIG_PKG_USING_BL_MCU_SDK is not set
657+
# CONFIG_PKG_USING_SOFT_SERIAL is not set
658+
# CONFIG_PKG_USING_MB85RS16 is not set
607659

608660
#
609661
# AI packages
@@ -671,7 +723,6 @@ CONFIG_RT_LWIP_USING_PING=y
671723
# CONFIG_PKG_USING_MCURSES is not set
672724
# CONFIG_PKG_USING_COWSAY is not set
673725
# CONFIG_PKG_USING_TERMBOX is not set
674-
CONFIG_SOC_LS=y
675726
CONFIG_SOC_LS1C300=y
676727
CONFIG_RT_LS1C_OPENLOONGSON=y
677728
# CONFIG_RT_LS1C_BAICAIBOARD is not set

bsp/ls1cdev/rtconfig.h

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define RT_USING_HOOK
1616
#define RT_USING_IDLE_HOOK
1717
#define RT_IDLE_HOOK_LIST_SIZE 4
18-
#define IDLE_THREAD_STACK_SIZE 1024
18+
#define IDLE_THREAD_STACK_SIZE 8192
1919

2020
/* kservice optimization */
2121

@@ -44,13 +44,13 @@
4444
#define RT_USING_CONSOLE
4545
#define RT_CONSOLEBUF_SIZE 128
4646
#define RT_CONSOLE_DEVICE_NAME "uart2"
47-
#define RT_VER_NUM 0x40004
47+
#define RT_VER_NUM 0x40100
4848

4949
/* RT-Thread Components */
5050

5151
#define RT_USING_COMPONENTS_INIT
5252
#define RT_USING_USER_MAIN
53-
#define RT_MAIN_THREAD_STACK_SIZE 2048
53+
#define RT_MAIN_THREAD_STACK_SIZE 8192
5454
#define RT_MAIN_THREAD_PRIORITY 10
5555

5656
/* C++ features */
@@ -63,7 +63,7 @@
6363
#define FINSH_USING_MSH
6464
#define FINSH_THREAD_NAME "tshell"
6565
#define FINSH_THREAD_PRIORITY 20
66-
#define FINSH_THREAD_STACK_SIZE 4096
66+
#define FINSH_THREAD_STACK_SIZE 8192
6767
#define FINSH_USING_HISTORY
6868
#define FINSH_HISTORY_LINES 5
6969
#define FINSH_USING_SYMTAB
@@ -75,6 +75,7 @@
7575
/* Device virtual file system */
7676

7777
#define RT_USING_DFS
78+
#define DFS_USING_POSIX
7879
#define DFS_USING_WORKDIR
7980
#define DFS_FILESYSTEMS_MAX 2
8081
#define DFS_FILESYSTEM_TYPES_MAX 2
@@ -93,6 +94,7 @@
9394
#define RT_DFS_ELM_DRIVES 2
9495
#define RT_DFS_ELM_MAX_SECTOR_SIZE 512
9596
#define RT_DFS_ELM_REENTRANT
97+
#define RT_DFS_ELM_MUTEX_TIMEOUT 3000
9698
#define RT_USING_DFS_DEVFS
9799

98100
/* Device Drivers */
@@ -116,10 +118,13 @@
116118
/* POSIX layer and C standard library */
117119

118120
#define RT_USING_LIBC
121+
#define RT_LIBC_USING_TIME
122+
#define RT_LIBC_DEFAULT_TIMEZONE 8
123+
124+
/* POSIX (Portable Operating System Interface) layer */
125+
119126
#define RT_USING_PTHREADS
120127
#define PTHREAD_NUM_MAX 8
121-
#define RT_USING_POSIX
122-
#define RT_LIBC_DEFAULT_TIMEZONE 8
123128

124129
/* Network */
125130

@@ -160,9 +165,9 @@
160165
#define RT_LWIP_TCP_WND 2048
161166
#define RT_LWIP_TCPTHREAD_PRIORITY 12
162167
#define RT_LWIP_TCPTHREAD_MBOX_SIZE 8
163-
#define RT_LWIP_TCPTHREAD_STACKSIZE 4096
168+
#define RT_LWIP_TCPTHREAD_STACKSIZE 8192
164169
#define RT_LWIP_ETHTHREAD_PRIORITY 14
165-
#define RT_LWIP_ETHTHREAD_STACKSIZE 512
170+
#define RT_LWIP_ETHTHREAD_STACKSIZE 8192
166171
#define RT_LWIP_ETHTHREAD_MBOX_SIZE 8
167172
#define LWIP_NETIF_STATUS_CALLBACK 1
168173
#define LWIP_NETIF_LINK_CALLBACK 1
@@ -213,15 +218,29 @@
213218

214219
/* multimedia packages */
215220

221+
/* LVGL: powerful and easy-to-use embedded GUI library */
222+
223+
224+
/* u8g2: a monochrome graphic library */
225+
226+
227+
/* PainterEngine: A cross-platform graphics application framework written in C language */
228+
216229

217230
/* tools packages */
218231

219232

220233
/* system packages */
221234

235+
/* enhanced kernel services */
236+
237+
222238
/* acceleration: Assembly language or algorithmic acceleration packages */
223239

224240

241+
/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */
242+
243+
225244
/* Micrium: Micrium software products porting for RT-Thread */
226245

227246

@@ -238,7 +257,6 @@
238257

239258
/* entertainment: terminal games and other interesting software packages */
240259

241-
#define SOC_LS
242260
#define SOC_LS1C300
243261
#define RT_LS1C_OPENLOONGSON
244262
#define RT_USING_UART2

0 commit comments

Comments
 (0)