Skip to content

Commit acaf753

Browse files
unicornxmysterywolf
authored andcommitted
bsp: qemu-virt64-riscv: Kconfig: remove duplicated RT_USING_VIRTIO
There is problem in the Kconfig of qemu-virt64-riscv. RT_USING_VIRTIO is already defined in components/drivers/virtio/Kconfig, so it should not be defined again in the BSP kconfig. The solution is to rename RT_USING_VIRTIO to BSP_USING_VIRTIO. Also, refer to the configuration method for virtio device drivers in bsp/qemu-virt64-aarch64/drivers/Kconfig to rewrite the configuration of BSP_USING_VIRTIO_xxx. Updated default .config/rtconfig.h at the same time. Signed-off-by: Chen Wang <[email protected]>
1 parent 8c762b4 commit acaf753

File tree

4 files changed

+239
-118
lines changed

4 files changed

+239
-118
lines changed

bsp/qemu-virt64-riscv/.config

Lines changed: 142 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,126 @@
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=y
15+
CONFIG_RT_KLIBC_USING_VSNPRINTF_STANDARD=y
16+
CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_SPECIFIERS=y
17+
CONFIG_RT_KLIBC_USING_VSNPRINTF_EXPONENTIAL_SPECIFIERS=y
18+
CONFIG_RT_KLIBC_USING_VSNPRINTF_WRITEBACK_SPECIFIER=y
19+
CONFIG_RT_KLIBC_USING_VSNPRINTF_CHECK_NUL_IN_FORMAT_SPECIFIER=y
20+
# CONFIG_RT_KLIBC_USING_VSNPRINTF_MSVC_STYLE_INTEGER_SPECIFIERS is not set
21+
CONFIG_RT_KLIBC_USING_VSNPRINTF_INTEGER_BUFFER_SIZE=32
22+
CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_BUFFER_SIZE=32
23+
CONFIG_RT_KLIBC_USING_VSNPRINTF_FLOAT_PRECISION=6
24+
CONFIG_RT_KLIBC_USING_VSNPRINTF_MAX_INTEGRAL_DIGITS_FOR_DECIMAL=9
25+
CONFIG_RT_KLIBC_USING_VSNPRINTF_LOG10_TAYLOR_TERMS=4
26+
# end of rt_vsnprintf options
27+
28+
#
29+
# rt_vsscanf options
30+
#
31+
# CONFIG_RT_KLIBC_USING_LIBC_VSSCANF is not set
32+
# end of rt_vsscanf options
33+
34+
#
35+
# rt_memset options
36+
#
37+
# CONFIG_RT_KLIBC_USING_USER_MEMSET is not set
38+
# CONFIG_RT_KLIBC_USING_LIBC_MEMSET is not set
39+
# CONFIG_RT_KLIBC_USING_TINY_MEMSET is not set
40+
# end of rt_memset options
41+
42+
#
43+
# rt_memcpy options
44+
#
45+
# CONFIG_RT_KLIBC_USING_USER_MEMCPY is not set
46+
# CONFIG_RT_KLIBC_USING_LIBC_MEMCPY is not set
47+
# CONFIG_RT_KLIBC_USING_TINY_MEMCPY is not set
48+
# end of rt_memcpy options
49+
50+
#
51+
# rt_memmove options
52+
#
53+
# CONFIG_RT_KLIBC_USING_USER_MEMMOVE is not set
54+
# CONFIG_RT_KLIBC_USING_LIBC_MEMMOVE is not set
55+
# end of rt_memmove options
56+
57+
#
58+
# rt_memcmp options
59+
#
60+
# CONFIG_RT_KLIBC_USING_USER_MEMCMP is not set
61+
# CONFIG_RT_KLIBC_USING_LIBC_MEMCMP is not set
62+
# end of rt_memcmp options
63+
64+
#
65+
# rt_strstr options
66+
#
67+
# CONFIG_RT_KLIBC_USING_USER_STRSTR is not set
68+
# CONFIG_RT_KLIBC_USING_LIBC_STRSTR is not set
69+
# end of rt_strstr options
70+
71+
#
72+
# rt_strcasecmp options
73+
#
74+
# CONFIG_RT_KLIBC_USING_USER_STRCASECMP is not set
75+
# end of rt_strcasecmp options
76+
77+
#
78+
# rt_strncpy options
79+
#
80+
# CONFIG_RT_KLIBC_USING_USER_STRNCPY is not set
81+
# CONFIG_RT_KLIBC_USING_LIBC_STRNCPY is not set
82+
# end of rt_strncpy options
83+
84+
#
85+
# rt_strcpy options
86+
#
87+
# CONFIG_RT_KLIBC_USING_USER_STRCPY is not set
88+
# CONFIG_RT_KLIBC_USING_LIBC_STRCPY is not set
89+
# end of rt_strcpy options
90+
91+
#
92+
# rt_strncmp options
93+
#
94+
# CONFIG_RT_KLIBC_USING_USER_STRNCMP is not set
95+
# CONFIG_RT_KLIBC_USING_LIBC_STRNCMP is not set
96+
# end of rt_strncmp options
97+
98+
#
99+
# rt_strcmp options
100+
#
101+
# CONFIG_RT_KLIBC_USING_USER_STRCMP is not set
102+
# CONFIG_RT_KLIBC_USING_LIBC_STRCMP is not set
103+
# end of rt_strcmp options
104+
105+
#
106+
# rt_strlen options
107+
#
108+
# CONFIG_RT_KLIBC_USING_USER_STRLEN is not set
109+
# CONFIG_RT_KLIBC_USING_LIBC_STRLEN is not set
110+
# end of rt_strlen options
111+
112+
#
113+
# rt_strnlen options
114+
#
115+
# CONFIG_RT_KLIBC_USING_USER_STRNLEN is not set
116+
# end of rt_strnlen options
117+
118+
# CONFIG_RT_UTEST_TC_USING_KLIBC is not set
119+
# end of klibc options
120+
5121
CONFIG_RT_NAME_MAX=24
6122
# CONFIG_RT_USING_ARCH_DATA_TYPE is not set
7-
# CONFIG_RT_USING_SMART is not set
8123
# CONFIG_RT_USING_NANO is not set
124+
# CONFIG_RT_USING_SMART is not set
9125
# CONFIG_RT_USING_AMP is not set
10126
# CONFIG_RT_USING_SMP is not set
11127
CONFIG_RT_CPUS_NR=1
@@ -15,6 +131,7 @@ CONFIG_RT_THREAD_PRIORITY_32=y
15131
# CONFIG_RT_THREAD_PRIORITY_256 is not set
16132
CONFIG_RT_THREAD_PRIORITY_MAX=32
17133
CONFIG_RT_TICK_PER_SECOND=100
134+
CONFIG_RT_USING_OVERFLOW_CHECK=y
18135
CONFIG_RT_USING_HOOK=y
19136
CONFIG_RT_HOOK_USING_FUNC_PTR=y
20137
# CONFIG_RT_USING_HOOKLIST is not set
@@ -28,26 +145,18 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=16384
28145
CONFIG_RT_USING_CPU_USAGE_TRACER=y
29146

30147
#
31-
# kservice optimization
148+
# kservice options
32149
#
33150
# CONFIG_RT_USING_TINY_FFS is not set
34-
# end of kservice optimization
35-
36-
#
37-
# klibc optimization
38-
#
39-
# CONFIG_RT_KLIBC_USING_STDLIB is not set
40-
# CONFIG_RT_KLIBC_USING_TINY_SIZE is not set
41-
CONFIG_RT_KLIBC_USING_PRINTF_LONGLONG=y
42-
# end of klibc optimization
151+
# end of kservice options
43152

44153
CONFIG_RT_USING_DEBUG=y
45154
CONFIG_RT_DEBUGING_ASSERT=y
46155
CONFIG_RT_DEBUGING_COLOR=y
47156
CONFIG_RT_DEBUGING_CONTEXT=y
48157
# CONFIG_RT_DEBUGING_AUTO_INIT is not set
49158
# CONFIG_RT_DEBUGING_PAGE_LEAK is not set
50-
CONFIG_RT_USING_OVERFLOW_CHECK=y
159+
# CONFIG_RT_USING_CI_ACTION is not set
51160

52161
#
53162
# Inter-Thread communication
@@ -83,7 +192,6 @@ CONFIG_RT_USING_DEVICE=y
83192
CONFIG_RT_USING_DEVICE_OPS=y
84193
# CONFIG_RT_USING_INTERRUPT_INFO is not set
85194
# CONFIG_RT_USING_THREADSAFE_PRINTF is not set
86-
CONFIG_RT_USING_SCHED_THREAD_CTX=y
87195
CONFIG_RT_USING_CONSOLE=y
88196
CONFIG_RT_CONSOLEBUF_SIZE=256
89197
CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
@@ -94,10 +202,11 @@ CONFIG_RT_BACKTRACE_LEVEL_MAX_NR=32
94202

95203
CONFIG_ARCH_CPU_64BIT=y
96204
CONFIG_RT_USING_CACHE=y
97-
CONFIG_RT_USING_HW_ATOMIC=y
98205
CONFIG_ARCH_MM_MMU=y
99206
CONFIG_ARCH_RISCV=y
207+
CONFIG_ARCH_RISCV_FPU=y
100208
CONFIG_ARCH_RISCV64=y
209+
CONFIG_ARCH_USING_NEW_CTX_SWITCH=y
101210
CONFIG_ARCH_USING_RISCV_COMMON64=y
102211
CONFIG_ARCH_REMAP_KERNEL=y
103212

@@ -186,12 +295,14 @@ CONFIG_RT_USING_SERIAL_V1=y
186295
# CONFIG_RT_USING_SERIAL_V2 is not set
187296
CONFIG_RT_SERIAL_USING_DMA=y
188297
CONFIG_RT_SERIAL_RB_BUFSZ=64
298+
# CONFIG_RT_USING_SERIAL_BYPASS is not set
189299
# CONFIG_RT_USING_CAN is not set
190300
CONFIG_RT_USING_CPUTIME=y
191301
CONFIG_RT_USING_CPUTIME_RISCV=y
192302
CONFIG_CPUTIME_TIMER_FREQ=10000000
193303
# CONFIG_RT_USING_I2C is not set
194304
# CONFIG_RT_USING_PHY is not set
305+
# CONFIG_RT_USING_PHY_V2 is not set
195306
# CONFIG_RT_USING_ADC is not set
196307
# CONFIG_RT_USING_DAC is not set
197308
CONFIG_RT_USING_NULL=y
@@ -215,15 +326,16 @@ CONFIG_RT_USING_SOFT_RTC=y
215326
# CONFIG_RT_USING_LCD is not set
216327
# CONFIG_RT_USING_HWCRYPTO is not set
217328
# CONFIG_RT_USING_WIFI is not set
329+
# CONFIG_RT_USING_BLK is not set
218330
CONFIG_RT_USING_VIRTIO=y
219331
CONFIG_RT_USING_VIRTIO10=y
220332
# CONFIG_RT_USING_VIRTIO_MMIO_ALIGN is not set
221333
CONFIG_RT_USING_VIRTIO_BLK=y
222334
CONFIG_RT_USING_VIRTIO_NET=y
223335
CONFIG_RT_USING_VIRTIO_CONSOLE=y
224336
CONFIG_RT_USING_VIRTIO_CONSOLE_PORT_MAX_NR=4
225-
# CONFIG_RT_USING_VIRTIO_GPU is not set
226-
# CONFIG_RT_USING_VIRTIO_INPUT is not set
337+
CONFIG_RT_USING_VIRTIO_GPU=y
338+
CONFIG_RT_USING_VIRTIO_INPUT=y
227339
CONFIG_RT_USING_PIN=y
228340
CONFIG_RT_USING_KTIME=y
229341
# CONFIG_RT_USING_HWTIMER is not set
@@ -370,6 +482,7 @@ CONFIG_LWIP_NETIF_LOOPBACK=0
370482
# CONFIG_RT_LWIP_USING_HW_CHECKSUM is not set
371483
CONFIG_RT_LWIP_USING_PING=y
372484
# CONFIG_LWIP_USING_DHCPD is not set
485+
# CONFIG_RT_LWIP_ENABLE_USER_HOOKS is not set
373486
# CONFIG_RT_LWIP_DEBUG is not set
374487
# CONFIG_RT_USING_AT is not set
375488
# end of Network
@@ -542,6 +655,7 @@ CONFIG_RT_USING_ADT_REF=y
542655
# CONFIG_PKG_USING_MATTER_ADAPTATION_LAYER is not set
543656
# CONFIG_PKG_USING_LHC_MODBUS is not set
544657
# CONFIG_PKG_USING_QMODBUS is not set
658+
# CONFIG_PKG_USING_PNET is not set
545659
# end of IoT - internet of things
546660

547661
#
@@ -569,6 +683,7 @@ CONFIG_RT_USING_ADT_REF=y
569683
# CONFIG_PKG_USING_JSMN is not set
570684
# CONFIG_PKG_USING_AGILE_JSMN is not set
571685
# CONFIG_PKG_USING_PARSON is not set
686+
# CONFIG_PKG_USING_RYAN_JSON is not set
572687
# end of JSON: JavaScript Object Notation, a lightweight data-interchange format
573688

574689
#
@@ -673,6 +788,7 @@ CONFIG_RT_USING_ADT_REF=y
673788
# CONFIG_PKG_USING_ARMV7M_DWT_TOOL is not set
674789
# CONFIG_PKG_USING_VOFA_PLUS is not set
675790
# CONFIG_PKG_USING_ZDEBUG is not set
791+
# CONFIG_PKG_USING_RVBACKTRACE is not set
676792
# end of tools packages
677793

678794
#
@@ -684,7 +800,6 @@ CONFIG_RT_USING_ADT_REF=y
684800
#
685801
# CONFIG_PKG_USING_RT_MEMCPY_CM is not set
686802
# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
687-
# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set
688803
# end of enhanced kernel services
689804

690805
# CONFIG_PKG_USING_AUNITY is not set
@@ -762,10 +877,12 @@ CONFIG_RT_USING_ADT_REF=y
762877
# CONFIG_PKG_USING_FLASH_BLOB is not set
763878
# CONFIG_PKG_USING_MLIBC is not set
764879
# CONFIG_PKG_USING_TASK_MSG_BUS is not set
880+
# CONFIG_PKG_USING_UART_FRAMEWORK is not set
765881
# CONFIG_PKG_USING_SFDB is not set
766882
# CONFIG_PKG_USING_RTP is not set
767883
# CONFIG_PKG_USING_REB is not set
768884
# CONFIG_PKG_USING_R_RHEALSTONE is not set
885+
# CONFIG_PKG_USING_HEARTBEAT is not set
769886
# end of system packages
770887

771888
#
@@ -862,6 +979,7 @@ CONFIG_RT_USING_ADT_REF=y
862979
# CONFIG_PKG_USING_MLX90632 is not set
863980
# CONFIG_PKG_USING_MLX90393 is not set
864981
# CONFIG_PKG_USING_MLX90392 is not set
982+
# CONFIG_PKG_USING_MLX90394 is not set
865983
# CONFIG_PKG_USING_MLX90397 is not set
866984
# CONFIG_PKG_USING_MS5611 is not set
867985
# CONFIG_PKG_USING_MAX31865 is not set
@@ -975,6 +1093,9 @@ CONFIG_RT_USING_ADT_REF=y
9751093
# CONFIG_PKG_USING_SYSTEM_RUN_LED is not set
9761094
# CONFIG_PKG_USING_BT_MX01 is not set
9771095
# CONFIG_PKG_USING_RGPOWER is not set
1096+
# CONFIG_PKG_USING_BT_MX02 is not set
1097+
# CONFIG_PKG_USING_GC9A01 is not set
1098+
# CONFIG_PKG_USING_IK485 is not set
9781099
# CONFIG_PKG_USING_SPI_TOOLS is not set
9791100
# end of peripheral libraries and drivers
9801101

@@ -1084,6 +1205,7 @@ CONFIG_RT_USING_ADT_REF=y
10841205
# CONFIG_PKG_USING_ARDUINO_MSGQ_C_CPP_DEMO is not set
10851206
# CONFIG_PKG_USING_ARDUINO_SKETCH_LOADER_DEMO is not set
10861207
# CONFIG_PKG_USING_ARDUINO_ULTRASOUND_RADAR is not set
1208+
# CONFIG_PKG_USING_ARDUINO_RTDUINO_SENSORFUSION_SHIELD is not set
10871209
# CONFIG_PKG_USING_ARDUINO_NINEINONE_SENSOR_SHIELD is not set
10881210
# CONFIG_PKG_USING_ARDUINO_SENSOR_KIT is not set
10891211
# CONFIG_PKG_USING_ARDUINO_MATLAB_SUPPORT is not set
@@ -1309,87 +1431,20 @@ CONFIG_RT_USING_ADT_REF=y
13091431
# end of Arduino libraries
13101432
# end of RT-Thread online packages
13111433

1312-
#
1313-
# Privated Packages of RealThread
1314-
#
1315-
# CONFIG_PKG_USING_CODEC is not set
1316-
# CONFIG_PKG_USING_PLAYER is not set
1317-
# CONFIG_PKG_USING_MPLAYER is not set
1318-
# CONFIG_PKG_USING_PERSIMMON_SRC is not set
1319-
# CONFIG_PKG_USING_JS_PERSIMMON is not set
1320-
# CONFIG_PKG_USING_JERRYSCRIPT_WIN32 is not set
1321-
1322-
#
1323-
# Network Utilities
1324-
#
1325-
# CONFIG_PKG_USING_MDNS is not set
1326-
# CONFIG_PKG_USING_UPNP is not set
1327-
# end of Network Utilities
1328-
1329-
# CONFIG_PKG_USING_WICED is not set
1330-
# CONFIG_PKG_USING_CLOUDSDK is not set
1331-
# CONFIG_PKG_USING_POWER_MANAGER is not set
1332-
# CONFIG_PKG_USING_RT_OTA is not set
1333-
# CONFIG_PKG_USING_RTINSIGHT is not set
1334-
# CONFIG_PKG_USING_SMARTCONFIG is not set
1335-
# CONFIG_PKG_USING_RTX is not set
1336-
# CONFIG_RT_USING_TESTCASE is not set
1337-
# CONFIG_PKG_USING_NGHTTP2 is not set
1338-
# CONFIG_PKG_USING_AVS is not set
1339-
# CONFIG_PKG_USING_ALI_LINKKIT is not set
1340-
# CONFIG_PKG_USING_STS is not set
1341-
# CONFIG_PKG_USING_DLMS is not set
1342-
# CONFIG_PKG_USING_AUDIO_FRAMEWORK is not set
1343-
# CONFIG_PKG_USING_ZBAR is not set
1344-
# CONFIG_PKG_USING_MCF is not set
1345-
# CONFIG_PKG_USING_URPC is not set
1346-
# CONFIG_PKG_USING_DCM is not set
1347-
# CONFIG_PKG_USING_EMQ is not set
1348-
# CONFIG_PKG_USING_CFGM is not set
1349-
# CONFIG_PKG_USING_RT_CMSIS_DAP is not set
1350-
# CONFIG_PKG_USING_SMODULE is not set
1351-
# CONFIG_PKG_USING_SNFD is not set
1352-
# CONFIG_PKG_USING_UDBD is not set
1353-
# CONFIG_PKG_USING_BENCHMARK is not set
1354-
# CONFIG_PKG_USING_UBJSON is not set
1355-
# CONFIG_PKG_USING_DATATYPE is not set
1356-
# CONFIG_PKG_USING_FASTFS is not set
1357-
# CONFIG_PKG_USING_RIL is not set
1358-
# CONFIG_PKG_USING_WATCH_DCM_SVC is not set
1359-
# CONFIG_PKG_USING_WATCH_APP_FWK is not set
1360-
# CONFIG_PKG_USING_GUI_TEST is not set
1361-
# CONFIG_PKG_USING_PMEM is not set
1362-
# CONFIG_PKG_USING_LWRDP is not set
1363-
# CONFIG_PKG_USING_MASAN is not set
1364-
# CONFIG_PKG_USING_BSDIFF_LIB is not set
1365-
# CONFIG_PKG_USING_PRC_DIFF is not set
1366-
1367-
#
1368-
# RT-Thread Smart
1369-
#
1370-
# CONFIG_PKG_USING_UKERNEL is not set
1371-
# end of RT-Thread Smart
1372-
1373-
# CONFIG_PKG_USING_TRACE_AGENT is not set
1374-
# CONFIG_PKG_USING_DLOG is not set
1375-
# CONFIG_PKG_USING_EXT4 is not set
1376-
# end of Privated Packages of RealThread
1377-
13781434
#
13791435
# RISC-V QEMU virt64 configs
13801436
#
13811437
CONFIG_RISCV_S_MODE=y
1438+
CONFIG_BSP_USING_VIRTIO=y
13821439
CONFIG_BSP_USING_VIRTIO_BLK=y
13831440
CONFIG_BSP_USING_VIRTIO_NET=y
13841441
CONFIG_BSP_USING_VIRTIO_CONSOLE=y
1385-
# CONFIG_BSP_USING_VIRTIO_GPU is not set
1386-
# CONFIG_BSP_USING_VIRTIO_INPUT is not set
1387-
# CONFIG_BSP_USING_UART1 is not set
1442+
CONFIG_BSP_USING_VIRTIO_GPU=y
1443+
CONFIG_BSP_USING_VIRTIO_INPUT=y
13881444
# end of RISC-V QEMU virt64 configs
13891445

13901446
CONFIG_BOARD_QEMU_VIRT_RV64=y
13911447
CONFIG_ENABLE_FPU=y
13921448
# CONFIG_ENABLE_VECTOR is not set
13931449
# CONFIG_RT_USING_USERSPACE_32BIT_LIMIT is not set
1394-
CONFIG_ARCH_USING_NEW_CTX_SWITCH=y
13951450
CONFIG___STACKSIZE__=16384

0 commit comments

Comments
 (0)