Browse Source

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 <unicorn_wang@outlook.com>
Chen Wang 6 months ago
parent
commit
acaf7533e1

+ 142 - 87
bsp/qemu-virt64-riscv/.config

@@ -2,10 +2,126 @@
 #
 #
 # RT-Thread Kernel
 # RT-Thread Kernel
 #
 #
+
+#
+# klibc options
+#
+
+#
+# rt_vsnprintf options
+#
+# CONFIG_RT_KLIBC_USING_LIBC_VSNPRINTF is not set
+CONFIG_RT_KLIBC_USING_VSNPRINTF_LONGLONG=y
+CONFIG_RT_KLIBC_USING_VSNPRINTF_STANDARD=y
+CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_SPECIFIERS=y
+CONFIG_RT_KLIBC_USING_VSNPRINTF_EXPONENTIAL_SPECIFIERS=y
+CONFIG_RT_KLIBC_USING_VSNPRINTF_WRITEBACK_SPECIFIER=y
+CONFIG_RT_KLIBC_USING_VSNPRINTF_CHECK_NUL_IN_FORMAT_SPECIFIER=y
+# CONFIG_RT_KLIBC_USING_VSNPRINTF_MSVC_STYLE_INTEGER_SPECIFIERS is not set
+CONFIG_RT_KLIBC_USING_VSNPRINTF_INTEGER_BUFFER_SIZE=32
+CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_BUFFER_SIZE=32
+CONFIG_RT_KLIBC_USING_VSNPRINTF_FLOAT_PRECISION=6
+CONFIG_RT_KLIBC_USING_VSNPRINTF_MAX_INTEGRAL_DIGITS_FOR_DECIMAL=9
+CONFIG_RT_KLIBC_USING_VSNPRINTF_LOG10_TAYLOR_TERMS=4
+# end of rt_vsnprintf options
+
+#
+# rt_vsscanf options
+#
+# CONFIG_RT_KLIBC_USING_LIBC_VSSCANF is not set
+# end of rt_vsscanf options
+
+#
+# rt_memset options
+#
+# CONFIG_RT_KLIBC_USING_USER_MEMSET is not set
+# CONFIG_RT_KLIBC_USING_LIBC_MEMSET is not set
+# CONFIG_RT_KLIBC_USING_TINY_MEMSET is not set
+# end of rt_memset options
+
+#
+# rt_memcpy options
+#
+# CONFIG_RT_KLIBC_USING_USER_MEMCPY is not set
+# CONFIG_RT_KLIBC_USING_LIBC_MEMCPY is not set
+# CONFIG_RT_KLIBC_USING_TINY_MEMCPY is not set
+# end of rt_memcpy options
+
+#
+# rt_memmove options
+#
+# CONFIG_RT_KLIBC_USING_USER_MEMMOVE is not set
+# CONFIG_RT_KLIBC_USING_LIBC_MEMMOVE is not set
+# end of rt_memmove options
+
+#
+# rt_memcmp options
+#
+# CONFIG_RT_KLIBC_USING_USER_MEMCMP is not set
+# CONFIG_RT_KLIBC_USING_LIBC_MEMCMP is not set
+# end of rt_memcmp options
+
+#
+# rt_strstr options
+#
+# CONFIG_RT_KLIBC_USING_USER_STRSTR is not set
+# CONFIG_RT_KLIBC_USING_LIBC_STRSTR is not set
+# end of rt_strstr options
+
+#
+# rt_strcasecmp options
+#
+# CONFIG_RT_KLIBC_USING_USER_STRCASECMP is not set
+# end of rt_strcasecmp options
+
+#
+# rt_strncpy options
+#
+# CONFIG_RT_KLIBC_USING_USER_STRNCPY is not set
+# CONFIG_RT_KLIBC_USING_LIBC_STRNCPY is not set
+# end of rt_strncpy options
+
+#
+# rt_strcpy options
+#
+# CONFIG_RT_KLIBC_USING_USER_STRCPY is not set
+# CONFIG_RT_KLIBC_USING_LIBC_STRCPY is not set
+# end of rt_strcpy options
+
+#
+# rt_strncmp options
+#
+# CONFIG_RT_KLIBC_USING_USER_STRNCMP is not set
+# CONFIG_RT_KLIBC_USING_LIBC_STRNCMP is not set
+# end of rt_strncmp options
+
+#
+# rt_strcmp options
+#
+# CONFIG_RT_KLIBC_USING_USER_STRCMP is not set
+# CONFIG_RT_KLIBC_USING_LIBC_STRCMP is not set
+# end of rt_strcmp options
+
+#
+# rt_strlen options
+#
+# CONFIG_RT_KLIBC_USING_USER_STRLEN is not set
+# CONFIG_RT_KLIBC_USING_LIBC_STRLEN is not set
+# end of rt_strlen options
+
+#
+# rt_strnlen options
+#
+# CONFIG_RT_KLIBC_USING_USER_STRNLEN is not set
+# end of rt_strnlen options
+
+# CONFIG_RT_UTEST_TC_USING_KLIBC is not set
+# end of klibc options
+
 CONFIG_RT_NAME_MAX=24
 CONFIG_RT_NAME_MAX=24
 # CONFIG_RT_USING_ARCH_DATA_TYPE is not set
 # CONFIG_RT_USING_ARCH_DATA_TYPE is not set
-# CONFIG_RT_USING_SMART is not set
 # CONFIG_RT_USING_NANO is not set
 # CONFIG_RT_USING_NANO is not set
+# CONFIG_RT_USING_SMART is not set
 # CONFIG_RT_USING_AMP is not set
 # CONFIG_RT_USING_AMP is not set
 # CONFIG_RT_USING_SMP is not set
 # CONFIG_RT_USING_SMP is not set
 CONFIG_RT_CPUS_NR=1
 CONFIG_RT_CPUS_NR=1
@@ -15,6 +131,7 @@ CONFIG_RT_THREAD_PRIORITY_32=y
 # CONFIG_RT_THREAD_PRIORITY_256 is not set
 # CONFIG_RT_THREAD_PRIORITY_256 is not set
 CONFIG_RT_THREAD_PRIORITY_MAX=32
 CONFIG_RT_THREAD_PRIORITY_MAX=32
 CONFIG_RT_TICK_PER_SECOND=100
 CONFIG_RT_TICK_PER_SECOND=100
+CONFIG_RT_USING_OVERFLOW_CHECK=y
 CONFIG_RT_USING_HOOK=y
 CONFIG_RT_USING_HOOK=y
 CONFIG_RT_HOOK_USING_FUNC_PTR=y
 CONFIG_RT_HOOK_USING_FUNC_PTR=y
 # CONFIG_RT_USING_HOOKLIST is not set
 # CONFIG_RT_USING_HOOKLIST is not set
@@ -28,18 +145,10 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=16384
 CONFIG_RT_USING_CPU_USAGE_TRACER=y
 CONFIG_RT_USING_CPU_USAGE_TRACER=y
 
 
 #
 #
-# kservice optimization
+# kservice options
 #
 #
 # CONFIG_RT_USING_TINY_FFS is not set
 # CONFIG_RT_USING_TINY_FFS is not set
-# end of kservice optimization
-
-#
-# klibc optimization
-#
-# CONFIG_RT_KLIBC_USING_STDLIB is not set
-# CONFIG_RT_KLIBC_USING_TINY_SIZE is not set
-CONFIG_RT_KLIBC_USING_PRINTF_LONGLONG=y
-# end of klibc optimization
+# end of kservice options
 
 
 CONFIG_RT_USING_DEBUG=y
 CONFIG_RT_USING_DEBUG=y
 CONFIG_RT_DEBUGING_ASSERT=y
 CONFIG_RT_DEBUGING_ASSERT=y
@@ -47,7 +156,7 @@ CONFIG_RT_DEBUGING_COLOR=y
 CONFIG_RT_DEBUGING_CONTEXT=y
 CONFIG_RT_DEBUGING_CONTEXT=y
 # CONFIG_RT_DEBUGING_AUTO_INIT is not set
 # CONFIG_RT_DEBUGING_AUTO_INIT is not set
 # CONFIG_RT_DEBUGING_PAGE_LEAK is not set
 # CONFIG_RT_DEBUGING_PAGE_LEAK is not set
-CONFIG_RT_USING_OVERFLOW_CHECK=y
+# CONFIG_RT_USING_CI_ACTION is not set
 
 
 #
 #
 # Inter-Thread communication
 # Inter-Thread communication
@@ -83,7 +192,6 @@ CONFIG_RT_USING_DEVICE=y
 CONFIG_RT_USING_DEVICE_OPS=y
 CONFIG_RT_USING_DEVICE_OPS=y
 # CONFIG_RT_USING_INTERRUPT_INFO is not set
 # CONFIG_RT_USING_INTERRUPT_INFO is not set
 # CONFIG_RT_USING_THREADSAFE_PRINTF is not set
 # CONFIG_RT_USING_THREADSAFE_PRINTF is not set
-CONFIG_RT_USING_SCHED_THREAD_CTX=y
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=256
 CONFIG_RT_CONSOLEBUF_SIZE=256
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
@@ -94,10 +202,11 @@ CONFIG_RT_BACKTRACE_LEVEL_MAX_NR=32
 
 
 CONFIG_ARCH_CPU_64BIT=y
 CONFIG_ARCH_CPU_64BIT=y
 CONFIG_RT_USING_CACHE=y
 CONFIG_RT_USING_CACHE=y
-CONFIG_RT_USING_HW_ATOMIC=y
 CONFIG_ARCH_MM_MMU=y
 CONFIG_ARCH_MM_MMU=y
 CONFIG_ARCH_RISCV=y
 CONFIG_ARCH_RISCV=y
+CONFIG_ARCH_RISCV_FPU=y
 CONFIG_ARCH_RISCV64=y
 CONFIG_ARCH_RISCV64=y
+CONFIG_ARCH_USING_NEW_CTX_SWITCH=y
 CONFIG_ARCH_USING_RISCV_COMMON64=y
 CONFIG_ARCH_USING_RISCV_COMMON64=y
 CONFIG_ARCH_REMAP_KERNEL=y
 CONFIG_ARCH_REMAP_KERNEL=y
 
 
@@ -186,12 +295,14 @@ CONFIG_RT_USING_SERIAL_V1=y
 # CONFIG_RT_USING_SERIAL_V2 is not set
 # CONFIG_RT_USING_SERIAL_V2 is not set
 CONFIG_RT_SERIAL_USING_DMA=y
 CONFIG_RT_SERIAL_USING_DMA=y
 CONFIG_RT_SERIAL_RB_BUFSZ=64
 CONFIG_RT_SERIAL_RB_BUFSZ=64
+# CONFIG_RT_USING_SERIAL_BYPASS is not set
 # CONFIG_RT_USING_CAN is not set
 # CONFIG_RT_USING_CAN is not set
 CONFIG_RT_USING_CPUTIME=y
 CONFIG_RT_USING_CPUTIME=y
 CONFIG_RT_USING_CPUTIME_RISCV=y
 CONFIG_RT_USING_CPUTIME_RISCV=y
 CONFIG_CPUTIME_TIMER_FREQ=10000000
 CONFIG_CPUTIME_TIMER_FREQ=10000000
 # CONFIG_RT_USING_I2C is not set
 # CONFIG_RT_USING_I2C is not set
 # CONFIG_RT_USING_PHY is not set
 # CONFIG_RT_USING_PHY is not set
+# CONFIG_RT_USING_PHY_V2 is not set
 # CONFIG_RT_USING_ADC is not set
 # CONFIG_RT_USING_ADC is not set
 # CONFIG_RT_USING_DAC is not set
 # CONFIG_RT_USING_DAC is not set
 CONFIG_RT_USING_NULL=y
 CONFIG_RT_USING_NULL=y
@@ -215,6 +326,7 @@ CONFIG_RT_USING_SOFT_RTC=y
 # CONFIG_RT_USING_LCD is not set
 # CONFIG_RT_USING_LCD is not set
 # CONFIG_RT_USING_HWCRYPTO is not set
 # CONFIG_RT_USING_HWCRYPTO is not set
 # CONFIG_RT_USING_WIFI is not set
 # CONFIG_RT_USING_WIFI is not set
+# CONFIG_RT_USING_BLK is not set
 CONFIG_RT_USING_VIRTIO=y
 CONFIG_RT_USING_VIRTIO=y
 CONFIG_RT_USING_VIRTIO10=y
 CONFIG_RT_USING_VIRTIO10=y
 # CONFIG_RT_USING_VIRTIO_MMIO_ALIGN is not set
 # CONFIG_RT_USING_VIRTIO_MMIO_ALIGN is not set
@@ -222,8 +334,8 @@ CONFIG_RT_USING_VIRTIO_BLK=y
 CONFIG_RT_USING_VIRTIO_NET=y
 CONFIG_RT_USING_VIRTIO_NET=y
 CONFIG_RT_USING_VIRTIO_CONSOLE=y
 CONFIG_RT_USING_VIRTIO_CONSOLE=y
 CONFIG_RT_USING_VIRTIO_CONSOLE_PORT_MAX_NR=4
 CONFIG_RT_USING_VIRTIO_CONSOLE_PORT_MAX_NR=4
-# CONFIG_RT_USING_VIRTIO_GPU is not set
-# CONFIG_RT_USING_VIRTIO_INPUT is not set
+CONFIG_RT_USING_VIRTIO_GPU=y
+CONFIG_RT_USING_VIRTIO_INPUT=y
 CONFIG_RT_USING_PIN=y
 CONFIG_RT_USING_PIN=y
 CONFIG_RT_USING_KTIME=y
 CONFIG_RT_USING_KTIME=y
 # CONFIG_RT_USING_HWTIMER is not set
 # CONFIG_RT_USING_HWTIMER is not set
@@ -370,6 +482,7 @@ CONFIG_LWIP_NETIF_LOOPBACK=0
 # CONFIG_RT_LWIP_USING_HW_CHECKSUM is not set
 # CONFIG_RT_LWIP_USING_HW_CHECKSUM is not set
 CONFIG_RT_LWIP_USING_PING=y
 CONFIG_RT_LWIP_USING_PING=y
 # CONFIG_LWIP_USING_DHCPD is not set
 # CONFIG_LWIP_USING_DHCPD is not set
+# CONFIG_RT_LWIP_ENABLE_USER_HOOKS is not set
 # CONFIG_RT_LWIP_DEBUG is not set
 # CONFIG_RT_LWIP_DEBUG is not set
 # CONFIG_RT_USING_AT is not set
 # CONFIG_RT_USING_AT is not set
 # end of Network
 # end of Network
@@ -542,6 +655,7 @@ CONFIG_RT_USING_ADT_REF=y
 # CONFIG_PKG_USING_MATTER_ADAPTATION_LAYER is not set
 # CONFIG_PKG_USING_MATTER_ADAPTATION_LAYER is not set
 # CONFIG_PKG_USING_LHC_MODBUS is not set
 # CONFIG_PKG_USING_LHC_MODBUS is not set
 # CONFIG_PKG_USING_QMODBUS is not set
 # CONFIG_PKG_USING_QMODBUS is not set
+# CONFIG_PKG_USING_PNET is not set
 # end of IoT - internet of things
 # end of IoT - internet of things
 
 
 #
 #
@@ -569,6 +683,7 @@ CONFIG_RT_USING_ADT_REF=y
 # CONFIG_PKG_USING_JSMN is not set
 # CONFIG_PKG_USING_JSMN is not set
 # CONFIG_PKG_USING_AGILE_JSMN is not set
 # CONFIG_PKG_USING_AGILE_JSMN is not set
 # CONFIG_PKG_USING_PARSON is not set
 # CONFIG_PKG_USING_PARSON is not set
+# CONFIG_PKG_USING_RYAN_JSON is not set
 # end of JSON: JavaScript Object Notation, a lightweight data-interchange format
 # end of JSON: JavaScript Object Notation, a lightweight data-interchange format
 
 
 #
 #
@@ -673,6 +788,7 @@ CONFIG_RT_USING_ADT_REF=y
 # CONFIG_PKG_USING_ARMV7M_DWT_TOOL is not set
 # CONFIG_PKG_USING_ARMV7M_DWT_TOOL is not set
 # CONFIG_PKG_USING_VOFA_PLUS is not set
 # CONFIG_PKG_USING_VOFA_PLUS is not set
 # CONFIG_PKG_USING_ZDEBUG is not set
 # CONFIG_PKG_USING_ZDEBUG is not set
+# CONFIG_PKG_USING_RVBACKTRACE is not set
 # end of tools packages
 # end of tools packages
 
 
 #
 #
@@ -684,7 +800,6 @@ CONFIG_RT_USING_ADT_REF=y
 #
 #
 # CONFIG_PKG_USING_RT_MEMCPY_CM is not set
 # CONFIG_PKG_USING_RT_MEMCPY_CM is not set
 # CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
 # CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
-# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set
 # end of enhanced kernel services
 # end of enhanced kernel services
 
 
 # CONFIG_PKG_USING_AUNITY is not set
 # CONFIG_PKG_USING_AUNITY is not set
@@ -762,10 +877,12 @@ CONFIG_RT_USING_ADT_REF=y
 # CONFIG_PKG_USING_FLASH_BLOB is not set
 # CONFIG_PKG_USING_FLASH_BLOB is not set
 # CONFIG_PKG_USING_MLIBC is not set
 # CONFIG_PKG_USING_MLIBC is not set
 # CONFIG_PKG_USING_TASK_MSG_BUS is not set
 # CONFIG_PKG_USING_TASK_MSG_BUS is not set
+# CONFIG_PKG_USING_UART_FRAMEWORK is not set
 # CONFIG_PKG_USING_SFDB is not set
 # CONFIG_PKG_USING_SFDB is not set
 # CONFIG_PKG_USING_RTP is not set
 # CONFIG_PKG_USING_RTP is not set
 # CONFIG_PKG_USING_REB is not set
 # CONFIG_PKG_USING_REB is not set
 # CONFIG_PKG_USING_R_RHEALSTONE is not set
 # CONFIG_PKG_USING_R_RHEALSTONE is not set
+# CONFIG_PKG_USING_HEARTBEAT is not set
 # end of system packages
 # end of system packages
 
 
 #
 #
@@ -862,6 +979,7 @@ CONFIG_RT_USING_ADT_REF=y
 # CONFIG_PKG_USING_MLX90632 is not set
 # CONFIG_PKG_USING_MLX90632 is not set
 # CONFIG_PKG_USING_MLX90393 is not set
 # CONFIG_PKG_USING_MLX90393 is not set
 # CONFIG_PKG_USING_MLX90392 is not set
 # CONFIG_PKG_USING_MLX90392 is not set
+# CONFIG_PKG_USING_MLX90394 is not set
 # CONFIG_PKG_USING_MLX90397 is not set
 # CONFIG_PKG_USING_MLX90397 is not set
 # CONFIG_PKG_USING_MS5611 is not set
 # CONFIG_PKG_USING_MS5611 is not set
 # CONFIG_PKG_USING_MAX31865 is not set
 # CONFIG_PKG_USING_MAX31865 is not set
@@ -975,6 +1093,9 @@ CONFIG_RT_USING_ADT_REF=y
 # CONFIG_PKG_USING_SYSTEM_RUN_LED is not set
 # CONFIG_PKG_USING_SYSTEM_RUN_LED is not set
 # CONFIG_PKG_USING_BT_MX01 is not set
 # CONFIG_PKG_USING_BT_MX01 is not set
 # CONFIG_PKG_USING_RGPOWER is not set
 # CONFIG_PKG_USING_RGPOWER is not set
+# CONFIG_PKG_USING_BT_MX02 is not set
+# CONFIG_PKG_USING_GC9A01 is not set
+# CONFIG_PKG_USING_IK485 is not set
 # CONFIG_PKG_USING_SPI_TOOLS is not set
 # CONFIG_PKG_USING_SPI_TOOLS is not set
 # end of peripheral libraries and drivers
 # end of peripheral libraries and drivers
 
 
@@ -1084,6 +1205,7 @@ CONFIG_RT_USING_ADT_REF=y
 # CONFIG_PKG_USING_ARDUINO_MSGQ_C_CPP_DEMO is not set
 # CONFIG_PKG_USING_ARDUINO_MSGQ_C_CPP_DEMO is not set
 # CONFIG_PKG_USING_ARDUINO_SKETCH_LOADER_DEMO is not set
 # CONFIG_PKG_USING_ARDUINO_SKETCH_LOADER_DEMO is not set
 # CONFIG_PKG_USING_ARDUINO_ULTRASOUND_RADAR is not set
 # CONFIG_PKG_USING_ARDUINO_ULTRASOUND_RADAR is not set
+# CONFIG_PKG_USING_ARDUINO_RTDUINO_SENSORFUSION_SHIELD is not set
 # CONFIG_PKG_USING_ARDUINO_NINEINONE_SENSOR_SHIELD is not set
 # CONFIG_PKG_USING_ARDUINO_NINEINONE_SENSOR_SHIELD is not set
 # CONFIG_PKG_USING_ARDUINO_SENSOR_KIT is not set
 # CONFIG_PKG_USING_ARDUINO_SENSOR_KIT is not set
 # CONFIG_PKG_USING_ARDUINO_MATLAB_SUPPORT is not set
 # CONFIG_PKG_USING_ARDUINO_MATLAB_SUPPORT is not set
@@ -1309,87 +1431,20 @@ CONFIG_RT_USING_ADT_REF=y
 # end of Arduino libraries
 # end of Arduino libraries
 # end of RT-Thread online packages
 # end of RT-Thread online packages
 
 
-#
-# Privated Packages of RealThread
-#
-# CONFIG_PKG_USING_CODEC is not set
-# CONFIG_PKG_USING_PLAYER is not set
-# CONFIG_PKG_USING_MPLAYER is not set
-# CONFIG_PKG_USING_PERSIMMON_SRC is not set
-# CONFIG_PKG_USING_JS_PERSIMMON is not set
-# CONFIG_PKG_USING_JERRYSCRIPT_WIN32 is not set
-
-#
-# Network Utilities
-#
-# CONFIG_PKG_USING_MDNS is not set
-# CONFIG_PKG_USING_UPNP is not set
-# end of Network Utilities
-
-# CONFIG_PKG_USING_WICED is not set
-# CONFIG_PKG_USING_CLOUDSDK is not set
-# CONFIG_PKG_USING_POWER_MANAGER is not set
-# CONFIG_PKG_USING_RT_OTA is not set
-# CONFIG_PKG_USING_RTINSIGHT is not set
-# CONFIG_PKG_USING_SMARTCONFIG is not set
-# CONFIG_PKG_USING_RTX is not set
-# CONFIG_RT_USING_TESTCASE is not set
-# CONFIG_PKG_USING_NGHTTP2 is not set
-# CONFIG_PKG_USING_AVS is not set
-# CONFIG_PKG_USING_ALI_LINKKIT is not set
-# CONFIG_PKG_USING_STS is not set
-# CONFIG_PKG_USING_DLMS is not set
-# CONFIG_PKG_USING_AUDIO_FRAMEWORK is not set
-# CONFIG_PKG_USING_ZBAR is not set
-# CONFIG_PKG_USING_MCF is not set
-# CONFIG_PKG_USING_URPC is not set
-# CONFIG_PKG_USING_DCM is not set
-# CONFIG_PKG_USING_EMQ is not set
-# CONFIG_PKG_USING_CFGM is not set
-# CONFIG_PKG_USING_RT_CMSIS_DAP is not set
-# CONFIG_PKG_USING_SMODULE is not set
-# CONFIG_PKG_USING_SNFD is not set
-# CONFIG_PKG_USING_UDBD is not set
-# CONFIG_PKG_USING_BENCHMARK is not set
-# CONFIG_PKG_USING_UBJSON is not set
-# CONFIG_PKG_USING_DATATYPE is not set
-# CONFIG_PKG_USING_FASTFS is not set
-# CONFIG_PKG_USING_RIL is not set
-# CONFIG_PKG_USING_WATCH_DCM_SVC is not set
-# CONFIG_PKG_USING_WATCH_APP_FWK is not set
-# CONFIG_PKG_USING_GUI_TEST is not set
-# CONFIG_PKG_USING_PMEM is not set
-# CONFIG_PKG_USING_LWRDP is not set
-# CONFIG_PKG_USING_MASAN is not set
-# CONFIG_PKG_USING_BSDIFF_LIB is not set
-# CONFIG_PKG_USING_PRC_DIFF is not set
-
-#
-# RT-Thread Smart
-#
-# CONFIG_PKG_USING_UKERNEL is not set
-# end of RT-Thread Smart
-
-# CONFIG_PKG_USING_TRACE_AGENT is not set
-# CONFIG_PKG_USING_DLOG is not set
-# CONFIG_PKG_USING_EXT4 is not set
-# end of Privated Packages of RealThread
-
 #
 #
 # RISC-V QEMU virt64 configs
 # RISC-V QEMU virt64 configs
 #
 #
 CONFIG_RISCV_S_MODE=y
 CONFIG_RISCV_S_MODE=y
+CONFIG_BSP_USING_VIRTIO=y
 CONFIG_BSP_USING_VIRTIO_BLK=y
 CONFIG_BSP_USING_VIRTIO_BLK=y
 CONFIG_BSP_USING_VIRTIO_NET=y
 CONFIG_BSP_USING_VIRTIO_NET=y
 CONFIG_BSP_USING_VIRTIO_CONSOLE=y
 CONFIG_BSP_USING_VIRTIO_CONSOLE=y
-# CONFIG_BSP_USING_VIRTIO_GPU is not set
-# CONFIG_BSP_USING_VIRTIO_INPUT is not set
-# CONFIG_BSP_USING_UART1 is not set
+CONFIG_BSP_USING_VIRTIO_GPU=y
+CONFIG_BSP_USING_VIRTIO_INPUT=y
 # end of RISC-V QEMU virt64 configs
 # end of RISC-V QEMU virt64 configs
 
 
 CONFIG_BOARD_QEMU_VIRT_RV64=y
 CONFIG_BOARD_QEMU_VIRT_RV64=y
 CONFIG_ENABLE_FPU=y
 CONFIG_ENABLE_FPU=y
 # CONFIG_ENABLE_VECTOR is not set
 # CONFIG_ENABLE_VECTOR is not set
 # CONFIG_RT_USING_USERSPACE_32BIT_LIMIT is not set
 # CONFIG_RT_USING_USERSPACE_32BIT_LIMIT is not set
-CONFIG_ARCH_USING_NEW_CTX_SWITCH=y
 CONFIG___STACKSIZE__=16384
 CONFIG___STACKSIZE__=16384

+ 16 - 6
bsp/qemu-virt64-riscv/driver/Kconfig

@@ -4,34 +4,44 @@ config RISCV_S_MODE
     bool "RT-Thread run in RISC-V S-Mode(supervisor mode)"
     bool "RT-Thread run in RISC-V S-Mode(supervisor mode)"
     default y
     default y
 
 
-config RT_USING_VIRTIO
+config BSP_USING_VIRTIO
     bool "Using VirtIO"
     bool "Using VirtIO"
     default y
     default y
     depends on RT_USING_DEVICE_OPS
     depends on RT_USING_DEVICE_OPS
 
 
 config BSP_USING_VIRTIO_BLK
 config BSP_USING_VIRTIO_BLK
     bool "Using VirtIO BLK"
     bool "Using VirtIO BLK"
+    select RT_USING_VIRTIO
+    select RT_USING_VIRTIO_BLK
     default y
     default y
-    depends on RT_USING_VIRTIO
+    depends on BSP_USING_VIRTIO
 
 
 config BSP_USING_VIRTIO_NET
 config BSP_USING_VIRTIO_NET
     bool "Using VirtIO NET"
     bool "Using VirtIO NET"
+    select RT_USING_VIRTIO
+    select RT_USING_VIRTIO_NET
     default y
     default y
-    depends on RT_USING_VIRTIO
+    depends on BSP_USING_VIRTIO
 
 
 config BSP_USING_VIRTIO_CONSOLE
 config BSP_USING_VIRTIO_CONSOLE
     bool "Using VirtIO Console"
     bool "Using VirtIO Console"
+    select RT_USING_VIRTIO
+    select RT_USING_VIRTIO_CONSOLE
     default y
     default y
-    depends on RT_USING_VIRTIO
+    depends on BSP_USING_VIRTIO
 
 
 config BSP_USING_VIRTIO_GPU
 config BSP_USING_VIRTIO_GPU
     bool "Using VirtIO GPU"
     bool "Using VirtIO GPU"
+    select RT_USING_VIRTIO
+    select RT_USING_VIRTIO_GPU
     default y
     default y
-    depends on RT_USING_VIRTIO
+    depends on BSP_USING_VIRTIO
 
 
 config BSP_USING_VIRTIO_INPUT
 config BSP_USING_VIRTIO_INPUT
     bool "Using VirtIO Input"
     bool "Using VirtIO Input"
+    select RT_USING_VIRTIO
+    select RT_USING_VIRTIO_INPUT
     default y
     default y
-    depends on RT_USING_VIRTIO
+    depends on BSP_USING_VIRTIO
 
 
 endmenu
 endmenu

+ 2 - 2
bsp/qemu-virt64-riscv/driver/drv_virtio.c

@@ -11,7 +11,7 @@
 #include <rtthread.h>
 #include <rtthread.h>
 #include <virt.h>
 #include <virt.h>
 
 
-#ifdef RT_USING_VIRTIO
+#ifdef BSP_USING_VIRTIO
 
 
 #include <virtio.h>
 #include <virtio.h>
 #ifdef BSP_USING_VIRTIO_BLK
 #ifdef BSP_USING_VIRTIO_BLK
@@ -97,4 +97,4 @@ int rt_virtio_devices_init(void)
     return 0;
     return 0;
 }
 }
 INIT_DEVICE_EXPORT(rt_virtio_devices_init);
 INIT_DEVICE_EXPORT(rt_virtio_devices_init);
-#endif  /* RT_USING_VIRTIO */
+#endif  /* BSP_USING_VIRTIO */

+ 79 - 23
bsp/qemu-virt64-riscv/rtconfig.h

@@ -3,12 +3,82 @@
 
 
 /* RT-Thread Kernel */
 /* RT-Thread Kernel */
 
 
+/* klibc options */
+
+/* rt_vsnprintf options */
+
+#define RT_KLIBC_USING_VSNPRINTF_LONGLONG
+#define RT_KLIBC_USING_VSNPRINTF_STANDARD
+#define RT_KLIBC_USING_VSNPRINTF_DECIMAL_SPECIFIERS
+#define RT_KLIBC_USING_VSNPRINTF_EXPONENTIAL_SPECIFIERS
+#define RT_KLIBC_USING_VSNPRINTF_WRITEBACK_SPECIFIER
+#define RT_KLIBC_USING_VSNPRINTF_CHECK_NUL_IN_FORMAT_SPECIFIER
+#define RT_KLIBC_USING_VSNPRINTF_INTEGER_BUFFER_SIZE 32
+#define RT_KLIBC_USING_VSNPRINTF_DECIMAL_BUFFER_SIZE 32
+#define RT_KLIBC_USING_VSNPRINTF_FLOAT_PRECISION 6
+#define RT_KLIBC_USING_VSNPRINTF_MAX_INTEGRAL_DIGITS_FOR_DECIMAL 9
+#define RT_KLIBC_USING_VSNPRINTF_LOG10_TAYLOR_TERMS 4
+/* end of rt_vsnprintf options */
+
+/* rt_vsscanf options */
+
+/* end of rt_vsscanf options */
+
+/* rt_memset options */
+
+/* end of rt_memset options */
+
+/* rt_memcpy options */
+
+/* end of rt_memcpy options */
+
+/* rt_memmove options */
+
+/* end of rt_memmove options */
+
+/* rt_memcmp options */
+
+/* end of rt_memcmp options */
+
+/* rt_strstr options */
+
+/* end of rt_strstr options */
+
+/* rt_strcasecmp options */
+
+/* end of rt_strcasecmp options */
+
+/* rt_strncpy options */
+
+/* end of rt_strncpy options */
+
+/* rt_strcpy options */
+
+/* end of rt_strcpy options */
+
+/* rt_strncmp options */
+
+/* end of rt_strncmp options */
+
+/* rt_strcmp options */
+
+/* end of rt_strcmp options */
+
+/* rt_strlen options */
+
+/* end of rt_strlen options */
+
+/* rt_strnlen options */
+
+/* end of rt_strnlen options */
+/* end of klibc options */
 #define RT_NAME_MAX 24
 #define RT_NAME_MAX 24
 #define RT_CPUS_NR 1
 #define RT_CPUS_NR 1
 #define RT_ALIGN_SIZE 8
 #define RT_ALIGN_SIZE 8
 #define RT_THREAD_PRIORITY_32
 #define RT_THREAD_PRIORITY_32
 #define RT_THREAD_PRIORITY_MAX 32
 #define RT_THREAD_PRIORITY_MAX 32
 #define RT_TICK_PER_SECOND 100
 #define RT_TICK_PER_SECOND 100
+#define RT_USING_OVERFLOW_CHECK
 #define RT_USING_HOOK
 #define RT_USING_HOOK
 #define RT_HOOK_USING_FUNC_PTR
 #define RT_HOOK_USING_FUNC_PTR
 #define RT_USING_IDLE_HOOK
 #define RT_USING_IDLE_HOOK
@@ -19,19 +89,13 @@
 #define RT_TIMER_THREAD_STACK_SIZE 16384
 #define RT_TIMER_THREAD_STACK_SIZE 16384
 #define RT_USING_CPU_USAGE_TRACER
 #define RT_USING_CPU_USAGE_TRACER
 
 
-/* kservice optimization */
-
-/* end of kservice optimization */
-
-/* klibc optimization */
+/* kservice options */
 
 
-#define RT_KLIBC_USING_VSNPRINTF_LONGLONG
-/* end of klibc optimization */
+/* end of kservice options */
 #define RT_USING_DEBUG
 #define RT_USING_DEBUG
 #define RT_DEBUGING_ASSERT
 #define RT_DEBUGING_ASSERT
 #define RT_DEBUGING_COLOR
 #define RT_DEBUGING_COLOR
 #define RT_DEBUGING_CONTEXT
 #define RT_DEBUGING_CONTEXT
-#define RT_USING_OVERFLOW_CHECK
 
 
 /* Inter-Thread communication */
 /* Inter-Thread communication */
 
 
@@ -54,7 +118,6 @@
 /* end of Memory Management */
 /* end of Memory Management */
 #define RT_USING_DEVICE
 #define RT_USING_DEVICE
 #define RT_USING_DEVICE_OPS
 #define RT_USING_DEVICE_OPS
-#define RT_USING_SCHED_THREAD_CTX
 #define RT_USING_CONSOLE
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 256
 #define RT_CONSOLEBUF_SIZE 256
 #define RT_CONSOLE_DEVICE_NAME "uart0"
 #define RT_CONSOLE_DEVICE_NAME "uart0"
@@ -64,10 +127,11 @@
 /* end of RT-Thread Kernel */
 /* end of RT-Thread Kernel */
 #define ARCH_CPU_64BIT
 #define ARCH_CPU_64BIT
 #define RT_USING_CACHE
 #define RT_USING_CACHE
-#define RT_USING_HW_ATOMIC
 #define ARCH_MM_MMU
 #define ARCH_MM_MMU
 #define ARCH_RISCV
 #define ARCH_RISCV
+#define ARCH_RISCV_FPU
 #define ARCH_RISCV64
 #define ARCH_RISCV64
+#define ARCH_USING_NEW_CTX_SWITCH
 #define ARCH_USING_RISCV_COMMON64
 #define ARCH_USING_RISCV_COMMON64
 #define ARCH_REMAP_KERNEL
 #define ARCH_REMAP_KERNEL
 
 
@@ -144,6 +208,8 @@
 #define RT_USING_VIRTIO_NET
 #define RT_USING_VIRTIO_NET
 #define RT_USING_VIRTIO_CONSOLE
 #define RT_USING_VIRTIO_CONSOLE
 #define RT_USING_VIRTIO_CONSOLE_PORT_MAX_NR 4
 #define RT_USING_VIRTIO_CONSOLE_PORT_MAX_NR 4
+#define RT_USING_VIRTIO_GPU
+#define RT_USING_VIRTIO_INPUT
 #define RT_USING_PIN
 #define RT_USING_PIN
 #define RT_USING_KTIME
 #define RT_USING_KTIME
 /* end of Device Drivers */
 /* end of Device Drivers */
@@ -451,28 +517,18 @@
 /* end of Arduino libraries */
 /* end of Arduino libraries */
 /* end of RT-Thread online packages */
 /* end of RT-Thread online packages */
 
 
-/* Privated Packages of RealThread */
-
-
-/* Network Utilities */
-
-/* end of Network Utilities */
-
-/* RT-Thread Smart */
-
-/* end of RT-Thread Smart */
-/* end of Privated Packages of RealThread */
-
 /* RISC-V QEMU virt64 configs */
 /* RISC-V QEMU virt64 configs */
 
 
 #define RISCV_S_MODE
 #define RISCV_S_MODE
+#define BSP_USING_VIRTIO
 #define BSP_USING_VIRTIO_BLK
 #define BSP_USING_VIRTIO_BLK
 #define BSP_USING_VIRTIO_NET
 #define BSP_USING_VIRTIO_NET
 #define BSP_USING_VIRTIO_CONSOLE
 #define BSP_USING_VIRTIO_CONSOLE
+#define BSP_USING_VIRTIO_GPU
+#define BSP_USING_VIRTIO_INPUT
 /* end of RISC-V QEMU virt64 configs */
 /* end of RISC-V QEMU virt64 configs */
 #define BOARD_QEMU_VIRT_RV64
 #define BOARD_QEMU_VIRT_RV64
 #define ENABLE_FPU
 #define ENABLE_FPU
-#define ARCH_USING_NEW_CTX_SWITCH
 #define __STACKSIZE__ 16384
 #define __STACKSIZE__ 16384
 
 
 #endif
 #endif