Skip to content

Commit d625772

Browse files
committed
Merge branch 'rtthread_5.2' into 'master'
rtthread 5.2适配 See merge request zhangyan1491/rt-thread!7
2 parents 0c4a204 + 9fcc5de commit d625772

Some content is hidden

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

65 files changed

+8724
-1068
lines changed

bsp/phytium/aarch32/.config

Lines changed: 160 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,116 @@
22
#
33
# RT-Thread Kernel
44
#
5+
6+
#
7+
# klibc options
8+
#
9+
10+
#
11+
# rt_vsnprintf options
12+
#
13+
# CONFIG_RT_KLIBC_USING_LIBC_VSNPRINTF is not set
14+
# CONFIG_RT_KLIBC_USING_VSNPRINTF_LONGLONG is not set
15+
# CONFIG_RT_KLIBC_USING_VSNPRINTF_STANDARD is not set
16+
# end of rt_vsnprintf options
17+
18+
#
19+
# rt_vsscanf options
20+
#
21+
# CONFIG_RT_KLIBC_USING_LIBC_VSSCANF is not set
22+
# end of rt_vsscanf options
23+
24+
#
25+
# rt_memset options
26+
#
27+
# CONFIG_RT_KLIBC_USING_USER_MEMSET is not set
28+
# CONFIG_RT_KLIBC_USING_LIBC_MEMSET is not set
29+
# CONFIG_RT_KLIBC_USING_TINY_MEMSET is not set
30+
# end of rt_memset options
31+
32+
#
33+
# rt_memcpy options
34+
#
35+
# CONFIG_RT_KLIBC_USING_USER_MEMCPY is not set
36+
# CONFIG_RT_KLIBC_USING_LIBC_MEMCPY is not set
37+
# CONFIG_RT_KLIBC_USING_TINY_MEMCPY is not set
38+
# end of rt_memcpy options
39+
40+
#
41+
# rt_memmove options
42+
#
43+
# CONFIG_RT_KLIBC_USING_USER_MEMMOVE is not set
44+
# CONFIG_RT_KLIBC_USING_LIBC_MEMMOVE is not set
45+
# end of rt_memmove options
46+
47+
#
48+
# rt_memcmp options
49+
#
50+
# CONFIG_RT_KLIBC_USING_USER_MEMCMP is not set
51+
# CONFIG_RT_KLIBC_USING_LIBC_MEMCMP is not set
52+
# end of rt_memcmp options
53+
54+
#
55+
# rt_strstr options
56+
#
57+
# CONFIG_RT_KLIBC_USING_USER_STRSTR is not set
58+
# CONFIG_RT_KLIBC_USING_LIBC_STRSTR is not set
59+
# end of rt_strstr options
60+
61+
#
62+
# rt_strcasecmp options
63+
#
64+
# CONFIG_RT_KLIBC_USING_USER_STRCASECMP is not set
65+
# end of rt_strcasecmp options
66+
67+
#
68+
# rt_strncpy options
69+
#
70+
# CONFIG_RT_KLIBC_USING_USER_STRNCPY is not set
71+
# CONFIG_RT_KLIBC_USING_LIBC_STRNCPY is not set
72+
# end of rt_strncpy options
73+
74+
#
75+
# rt_strcpy options
76+
#
77+
# CONFIG_RT_KLIBC_USING_USER_STRCPY is not set
78+
# CONFIG_RT_KLIBC_USING_LIBC_STRCPY is not set
79+
# end of rt_strcpy options
80+
81+
#
82+
# rt_strncmp options
83+
#
84+
# CONFIG_RT_KLIBC_USING_USER_STRNCMP is not set
85+
# CONFIG_RT_KLIBC_USING_LIBC_STRNCMP is not set
86+
# end of rt_strncmp options
87+
88+
#
89+
# rt_strcmp options
90+
#
91+
# CONFIG_RT_KLIBC_USING_USER_STRCMP is not set
92+
# CONFIG_RT_KLIBC_USING_LIBC_STRCMP is not set
93+
# end of rt_strcmp options
94+
95+
#
96+
# rt_strlen options
97+
#
98+
# CONFIG_RT_KLIBC_USING_USER_STRLEN is not set
99+
# CONFIG_RT_KLIBC_USING_LIBC_STRLEN is not set
100+
# end of rt_strlen options
101+
102+
#
103+
# rt_strnlen options
104+
#
105+
# CONFIG_RT_KLIBC_USING_USER_STRNLEN is not set
106+
# end of rt_strnlen options
107+
108+
# CONFIG_RT_UTEST_TC_USING_KLIBC is not set
109+
# end of klibc options
110+
5111
CONFIG_RT_NAME_MAX=16
6112
# CONFIG_RT_USING_ARCH_DATA_TYPE is not set
7-
# CONFIG_RT_USING_SMART is not set
8113
# CONFIG_RT_USING_NANO is not set
114+
# CONFIG_RT_USING_SMART is not set
9115
# CONFIG_RT_USING_AMP is not set
10116
CONFIG_RT_USING_SMP=y
11117
CONFIG_RT_CPUS_NR=2
@@ -15,6 +121,7 @@ CONFIG_RT_THREAD_PRIORITY_32=y
15121
# CONFIG_RT_THREAD_PRIORITY_256 is not set
16122
CONFIG_RT_THREAD_PRIORITY_MAX=32
17123
CONFIG_RT_TICK_PER_SECOND=1000
124+
CONFIG_RT_USING_OVERFLOW_CHECK=y
18125
CONFIG_RT_USING_HOOK=y
19126
CONFIG_RT_HOOK_USING_FUNC_PTR=y
20127
# CONFIG_RT_USING_HOOKLIST is not set
@@ -29,28 +136,19 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=4096
29136
# CONFIG_RT_USING_CPU_USAGE_TRACER is not set
30137

31138
#
32-
# kservice optimization
139+
# kservice options
33140
#
34141
# CONFIG_RT_USING_TINY_FFS is not set
35-
# end of kservice optimization
36-
37-
#
38-
# klibc optimization
39-
#
40-
# CONFIG_RT_KLIBC_USING_STDLIB is not set
41-
# CONFIG_RT_KLIBC_USING_TINY_SIZE is not set
42-
# CONFIG_RT_KLIBC_USING_PRINTF_LONGLONG is not set
43-
# end of klibc optimization
142+
# end of kservice options
44143

45144
CONFIG_RT_USING_DEBUG=y
46145
CONFIG_RT_DEBUGING_ASSERT=y
47146
CONFIG_RT_DEBUGING_COLOR=y
48147
CONFIG_RT_DEBUGING_CONTEXT=y
49148
# CONFIG_RT_DEBUGING_AUTO_INIT is not set
50-
# CONFIG_RT_DEBUGING_PAGE_LEAK is not set
51149
# CONFIG_RT_DEBUGING_SPINLOCK is not set
52150
# CONFIG_RT_DEBUGING_CRITICAL is not set
53-
CONFIG_RT_USING_OVERFLOW_CHECK=y
151+
# CONFIG_RT_USING_CI_ACTION is not set
54152

55153
#
56154
# Inter-Thread communication
@@ -67,8 +165,7 @@ CONFIG_RT_USING_MESSAGEQUEUE_PRIORITY=y
67165
#
68166
# Memory Management
69167
#
70-
CONFIG_RT_PAGE_MAX_ORDER=11
71-
# CONFIG_RT_USING_MEMPOOL is not set
168+
CONFIG_RT_USING_MEMPOOL=y
72169
# CONFIG_RT_USING_SMALL_MEM is not set
73170
CONFIG_RT_USING_SLAB=y
74171
CONFIG_RT_USING_MEMHEAP=y
@@ -88,7 +185,6 @@ CONFIG_RT_USING_DEVICE=y
88185
# CONFIG_RT_USING_DEVICE_OPS is not set
89186
# CONFIG_RT_USING_INTERRUPT_INFO is not set
90187
# CONFIG_RT_USING_THREADSAFE_PRINTF is not set
91-
CONFIG_RT_USING_SCHED_THREAD_CTX=y
92188
CONFIG_RT_USING_CONSOLE=y
93189
CONFIG_RT_CONSOLEBUF_SIZE=256
94190
CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
@@ -172,6 +268,7 @@ CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000
172268
# end of elm-chan's FatFs, Generic FAT Filesystem Module
173269

174270
CONFIG_RT_USING_DFS_DEVFS=y
271+
# CONFIG_RT_USING_DFS_ISO9660 is not set
175272
# CONFIG_RT_USING_DFS_ROMFS is not set
176273
# CONFIG_RT_USING_DFS_CROMFS is not set
177274
CONFIG_RT_USING_DFS_RAMFS=y
@@ -197,6 +294,7 @@ CONFIG_RT_USING_SERIAL_V1=y
197294
# CONFIG_RT_USING_SERIAL_V2 is not set
198295
CONFIG_RT_SERIAL_USING_DMA=y
199296
CONFIG_RT_SERIAL_RB_BUFSZ=1024
297+
# CONFIG_RT_USING_SERIAL_BYPASS is not set
200298
CONFIG_RT_USING_CAN=y
201299
# CONFIG_RT_CAN_USING_HDR is not set
202300
CONFIG_RT_CAN_USING_CANFD=y
@@ -207,6 +305,7 @@ CONFIG_RT_USING_I2C_BITOPS=y
207305
# CONFIG_RT_I2C_BITOPS_DEBUG is not set
208306
# CONFIG_RT_USING_SOFT_I2C is not set
209307
# CONFIG_RT_USING_PHY is not set
308+
# CONFIG_RT_USING_PHY_V2 is not set
210309
# CONFIG_RT_USING_ADC is not set
211310
# CONFIG_RT_USING_DAC is not set
212311
CONFIG_RT_USING_NULL=y
@@ -228,20 +327,33 @@ CONFIG_RT_MMCSD_STACK_SIZE=4096
228327
CONFIG_RT_MMCSD_THREAD_PRIORITY=22
229328
CONFIG_RT_MMCSD_MAX_PARTITION=16
230329
# CONFIG_RT_SDIO_DEBUG is not set
330+
# CONFIG_RT_USING_SDHCI is not set
231331
CONFIG_RT_USING_SPI=y
232-
# CONFIG_RT_USING_SPI_BITOPS is not set
332+
# CONFIG_RT_USING_SOFT_SPI is not set
233333
CONFIG_RT_USING_QSPI=y
234334
# CONFIG_RT_USING_SPI_MSD is not set
235335
# CONFIG_RT_USING_SFUD is not set
236336
# CONFIG_RT_USING_ENC28J60 is not set
237337
# CONFIG_RT_USING_SPI_WIFI is not set
238338
# CONFIG_RT_USING_WDT is not set
239-
# CONFIG_RT_USING_AUDIO is not set
339+
CONFIG_RT_USING_AUDIO=y
340+
CONFIG_RT_AUDIO_REPLAY_MP_BLOCK_SIZE=4096
341+
CONFIG_RT_AUDIO_REPLAY_MP_BLOCK_COUNT=2
342+
CONFIG_RT_AUDIO_RECORD_PIPE_SIZE=2048
240343
# CONFIG_RT_USING_SENSOR is not set
241344
# CONFIG_RT_USING_TOUCH is not set
242345
# CONFIG_RT_USING_LCD is not set
243346
# CONFIG_RT_USING_HWCRYPTO is not set
244347
# CONFIG_RT_USING_WIFI is not set
348+
CONFIG_RT_USING_BLK=y
349+
350+
#
351+
# Partition Types
352+
#
353+
CONFIG_RT_BLK_PARTITION_DFS=y
354+
CONFIG_RT_BLK_PARTITION_EFI=y
355+
# end of Partition Types
356+
245357
# CONFIG_RT_USING_VIRTIO is not set
246358
CONFIG_RT_USING_PIN=y
247359
CONFIG_RT_USING_KTIME=y
@@ -259,13 +371,16 @@ CONFIG_RT_CHERRYUSB_HOST=y
259371
# CONFIG_RT_CHERRYUSB_HOST_EHCI_CUSTOM is not set
260372
# CONFIG_RT_CHERRYUSB_HOST_DWC2_ST is not set
261373
# CONFIG_RT_CHERRYUSB_HOST_DWC2_ESP is not set
374+
# CONFIG_RT_CHERRYUSB_HOST_DWC2_KENDRYTE is not set
262375
# CONFIG_RT_CHERRYUSB_HOST_DWC2_CUSTOM is not set
263376
# CONFIG_RT_CHERRYUSB_HOST_MUSB_ES is not set
264377
# CONFIG_RT_CHERRYUSB_HOST_MUSB_SUNXI is not set
265378
# CONFIG_RT_CHERRYUSB_HOST_MUSB_BK is not set
266379
# CONFIG_RT_CHERRYUSB_HOST_MUSB_CUSTOM is not set
267380
# CONFIG_RT_CHERRYUSB_HOST_PUSB2 is not set
268381
CONFIG_RT_CHERRYUSB_HOST_XHCI=y
382+
# CONFIG_RT_CHERRYUSB_HOST_KINETIS_MCX is not set
383+
# CONFIG_RT_CHERRYUSB_HOST_KINETIS_CUSTOM is not set
269384
# CONFIG_RT_CHERRYUSB_HOST_CDC_ACM is not set
270385
CONFIG_RT_CHERRYUSB_HOST_HID=y
271386
CONFIG_RT_CHERRYUSB_HOST_MSC=y
@@ -423,6 +538,7 @@ CONFIG_LWIP_NETIF_LOOPBACK=0
423538
# CONFIG_RT_LWIP_USING_HW_CHECKSUM is not set
424539
CONFIG_RT_LWIP_USING_PING=y
425540
# CONFIG_LWIP_USING_DHCPD is not set
541+
# CONFIG_RT_LWIP_ENABLE_USER_HOOKS is not set
426542
# CONFIG_RT_LWIP_DEBUG is not set
427543
# CONFIG_RT_USING_AT is not set
428544
# end of Network
@@ -444,6 +560,8 @@ CONFIG_YMODEM_USING_FILE_TRANSFER=y
444560
CONFIG_RT_USING_UTEST=y
445561
CONFIG_UTEST_THR_STACK_SIZE=4096
446562
CONFIG_UTEST_THR_PRIORITY=20
563+
# CONFIG_RT_UTEST_USING_AUTO_RUN is not set
564+
# CONFIG_RT_UTEST_USING_ALL_CASES is not set
447565
# CONFIG_RT_USING_VAR_EXPORT is not set
448566
CONFIG_RT_USING_RESOURCE_ID=y
449567
CONFIG_RT_USING_ADT=y
@@ -456,6 +574,22 @@ CONFIG_RT_USING_ADT_REF=y
456574

457575
# CONFIG_RT_USING_VBUS is not set
458576

577+
#
578+
# Memory management
579+
#
580+
CONFIG_RT_PAGE_AFFINITY_BLOCK_SIZE=0x1000
581+
CONFIG_RT_PAGE_MAX_ORDER=11
582+
# CONFIG_RT_USING_MEMBLOCK is not set
583+
584+
#
585+
# Debugging
586+
#
587+
# CONFIG_RT_DEBUGGING_ALIASING is not set
588+
# CONFIG_RT_DEBUGING_PAGE_LEAK is not set
589+
# CONFIG_RT_DEBUGGING_PAGE_POISON is not set
590+
# end of Debugging
591+
# end of Memory management
592+
459593
#
460594
# Using USB legacy version
461595
#
@@ -1352,6 +1486,7 @@ CONFIG_RT_USING_ADT_REF=y
13521486
#
13531487
# On-chip Peripheral Drivers
13541488
#
1489+
CONFIG_BSP_USING_DRIVERS_EXAMPLE=y
13551490
CONFIG_BSP_USING_IOPAD=y
13561491
CONFIG_BSP_USING_UART=y
13571492
CONFIG_RT_USING_UART0=y
@@ -1413,6 +1548,10 @@ CONFIG_USE_SDIF1_TF=y
14131548
CONFIG_BSP_USING_DC=y
14141549
CONFIG_RT_USING_DC_CHANNEL0=y
14151550
CONFIG_RT_USING_DC_CHANNEL1=y
1551+
CONFIG_BSP_USING_I2S=y
1552+
CONFIG_RT_I2S_SAMPLERATE=8000
1553+
CONFIG_RT_I2S_SAMPLEBITS=16
1554+
CONFIG_RT_USING_I2S0=y
14161555
# end of On-chip Peripheral Drivers
14171556

14181557
#
@@ -1438,6 +1577,8 @@ CONFIG_TARGET_E2000D=y
14381577
# CONFIG_TARGET_FT2004 is not set
14391578
# CONFIG_TARGET_D2000 is not set
14401579
# CONFIG_TARGET_PD2308 is not set
1580+
# CONFIG_TARGET_PS2316 is not set
1581+
# CONFIG_TARGET_QEMU_VIRT is not set
14411582
CONFIG_SOC_NAME="e2000"
14421583
CONFIG_TARGET_TYPE_NAME="d"
14431584
CONFIG_SOC_CORE_NUM=2
@@ -1491,5 +1632,6 @@ CONFIG_LOG_ERROR=y
14911632
CONFIG_USE_DEFAULT_INTERRUPT_CONFIG=y
14921633
CONFIG_INTERRUPT_ROLE_MASTER=y
14931634
# CONFIG_INTERRUPT_ROLE_SLAVE is not set
1635+
# CONFIG_INTERRUPT_ROLE_NONE is not set
14941636
# end of Sdk common configuration
14951637
# end of Standalone Setting

0 commit comments

Comments
 (0)