Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-20 04:16:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

drivers/virtio and vhost: auto-select parent config from sub-drivers

Browse Source 
Change DRIVERS_VIRTIO and DRIVERS_VHOST from menuconfig to hidden config
options. Each virtio/vhost sub-driver now automatically selects its parent
config, eliminating the need to manually enable DRIVERS_VIRTIO or
DRIVERS_VHOST in defconfig files.

This simplifies board configuration by removing redundant CONFIG_DRIVERS_VIRTIO
entries from affected defconfig files.

Signed-off-by: Yongrong Wang <wangyongrong@xiaomi.com>
Signed-off-by: Bowen Wang <wangbowen6@xiaomi.com>
This commit is contained in:
Yongrong Wang
2025-02-24 11:00:07 +08:00
committed by Xiang Xiao
parent 2fc2f44b61
commit a286287f4e
30 changed files with 17 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/arm/imx9/imx95-evk/configs/rpmsg/defconfig
-5
View File
@@ -38,14 +38,9 @@ CONFIG_DEBUG_RPMSG_ERROR=y
CONFIG_DEBUG_RPMSG_WARN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEBUG_USAGEFAULT=y
CONFIG_DEBUG_VIRTIO=y
CONFIG_DEBUG_VIRTIO_ERROR=y
CONFIG_DEBUG_VIRTIO_INFO=y
CONFIG_DEBUG_VIRTIO_WARN=y
CONFIG_DEFAULT_TASK_STACKSIZE=8192
CONFIG_DEV_RPMSG=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_FS_PROCFS=y
CONFIG_FS_RPMSGFS=y
CONFIG_IDLETHREAD_STACKSIZE=8192
boards/arm/qemu/qemu-armv7a/configs/full/defconfig
-1
View File
@@ -43,7 +43,6 @@ CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DEV_URANDOM=y
CONFIG_DRIVERS_NOTE=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_GPU=y
CONFIG_DRIVERS_VIRTIO_INPUT=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
boards/arm/qemu/qemu-armv7a/configs/rpproxy/defconfig
-2
View File
@@ -42,10 +42,8 @@ CONFIG_DEBUG_PCI_WARN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEVICE_TREE=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VHOST=y
CONFIG_DRIVERS_VHOST_RNG=y
CONFIG_DRIVERS_VHOST_RPMSG=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_SERIAL=y
CONFIG_EXAMPLES_HELLO=y
boards/arm/qemu/qemu-armv7a/configs/rpserver/defconfig
-1
View File
@@ -44,7 +44,6 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEVICE_TREE=y
CONFIG_DEV_RPMSG_SERVER=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_RNG=y
CONFIG_DRIVERS_VIRTIO_RPMSG=y
boards/arm64/qemu/qemu-armv8a/configs/fastboot/defconfig
-1
View File
@@ -24,7 +24,6 @@ CONFIG_DEFAULT_TASK_STACKSIZE=8192
CONFIG_DEVICE_TREE=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig
-1
View File
@@ -23,7 +23,6 @@ CONFIG_DEFAULT_TASK_STACKSIZE=8192
CONFIG_DEVICE_TREE=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_GPU=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_SERIAL=y
boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig
-1
View File
@@ -29,7 +29,6 @@ CONFIG_DEFAULT_TASK_STACKSIZE=8192
CONFIG_DEVICE_TREE=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig
-1
View File
@@ -25,7 +25,6 @@ CONFIG_DEFAULT_TASK_STACKSIZE=8192
CONFIG_DEVICE_TREE=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig
-1
View File
@@ -23,7 +23,6 @@ CONFIG_DEFAULT_TASK_STACKSIZE=8192
CONFIG_DEVICE_TREE=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig
-1
View File
@@ -25,7 +25,6 @@ CONFIG_DEFAULT_TASK_STACKSIZE=8192
CONFIG_DEVICE_TREE=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig
-2
View File
@@ -33,10 +33,8 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_TASK_STACKSIZE=8192
CONFIG_DEVICE_TREE=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VHOST=y
CONFIG_DRIVERS_VHOST_RNG=y
CONFIG_DRIVERS_VHOST_RPMSG=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_SERIAL=y
CONFIG_EXAMPLES_HELLO=y
boards/arm64/qemu/qemu-armv8a/configs/rpserver/defconfig
-1
View File
@@ -33,7 +33,6 @@ CONFIG_DEFAULT_TASK_STACKSIZE=8192
CONFIG_DEVICE_TREE=y
CONFIG_DEV_RPMSG=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_RNG=y
CONFIG_DRIVERS_VIRTIO_RPMSG=y
boards/arm64/qemu/qemu-armv8a/configs/xedge_demo/defconfig
-1
View File
@@ -25,7 +25,6 @@ CONFIG_DEFAULT_TASK_STACKSIZE=8192
CONFIG_DEVICE_TREE=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/risc-v/qemu-rv/rv-virt/configs/citest/defconfig
-1
View File
@@ -46,7 +46,6 @@ CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_ELF=y
boards/risc-v/qemu-rv/rv-virt/configs/fb/defconfig
-1
View File
@@ -33,7 +33,6 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_GPU=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_SERIAL=y
boards/risc-v/qemu-rv/rv-virt/configs/fb64/defconfig
-1
View File
@@ -33,7 +33,6 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_GPU=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_SERIAL=y
boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig
-1
View File
@@ -54,7 +54,6 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_GPU=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_SERIAL=y
boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig
-1
View File
@@ -51,7 +51,6 @@ CONFIG_CODECS_HASH_MD5=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig
-1
View File
@@ -51,7 +51,6 @@ CONFIG_CODECS_HASH_MD5=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/risc-v/qemu-rv/rv-virt/configs/lvgl64_vector/defconfig
-1
View File
@@ -34,7 +34,6 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_GPU=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_SERIAL=y
boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig
-1
View File
@@ -35,7 +35,6 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig
-1
View File
@@ -35,7 +35,6 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig
-1
View File
@@ -35,7 +35,6 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig
-1
View File
@@ -35,7 +35,6 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/risc-v/qemu-rv/rv-virt/configs/python/defconfig
-1
View File
@@ -39,7 +39,6 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DEV_URANDOM=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_BLK=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_NET=y
boards/risc-v/qemu-rv/rv-virt/configs/virt_nsh/defconfig
-1
View File
@@ -28,7 +28,6 @@ CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_SERIAL=y
CONFIG_DRIVERS_VIRTIO_SERIAL_CONSOLE=y
boards/sim/sim/sim/configs/rpproxy/defconfig
-1
View File
@@ -21,7 +21,6 @@ CONFIG_DEBUG_FS_ERROR=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_RPMSG=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VHOST=y
CONFIG_DRIVERS_VHOST_RNG=y
CONFIG_DRIVERS_VHOST_RPMSG=y
CONFIG_EXAMPLES_HELLO=y
boards/sim/sim/sim/configs/rpserver/defconfig
-1
View File
@@ -22,7 +22,6 @@ CONFIG_DEBUG_FS_ERROR=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_RPMSG_SERVER=y
CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_VIRTIO=y
CONFIG_DRIVERS_VIRTIO_RNG=y
CONFIG_DRIVERS_VIRTIO_RPMSG=y
CONFIG_EXAMPLES_RPMSGSOCKET=y
drivers/vhost/Kconfig
+4 -5
View File
@@ -3,20 +3,19 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
menuconfig DRIVERS_VHOST
bool "Virtual Host Support"
config DRIVERS_VHOST
bool
select OPENAMP
default n
if DRIVERS_VHOST
config DRIVERS_VHOST_RNG
bool "Virtual Host Rng Device Support"
default n
select DRIVERS_VHOST
config DRIVERS_VHOST_RPMSG
bool "Virtual Host Rpmsg Device Support"
default n
select RPMSG_VIRTIO
select DRIVERS_VHOST
endif # DRIVERS_VHOST
drivers/virtio/Kconfig
+13 -5
View File
@@ -3,15 +3,15 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
menuconfig DRIVERS_VIRTIO
bool "Virtio Device Support"
config DRIVERS_VIRTIO
bool
select OPENAMP
default n
if DRIVERS_VIRTIO
config DRIVERS_VIRTIO_MMIO
bool "Virtio MMIO Device Support"
default n
select DRIVERS_VIRTIO
config DRIVERS_VIRTIO_MMIO_QUEUE_LEN
int "Virtio MMIO Virtio Queue Length"
@@ -25,6 +25,7 @@ config DRIVERS_VIRTIO_MMIO_QUEUE_LEN
config DRIVERS_VIRTIO_PCI
bool "Virtio PCI Device Support"
default n
select DRIVERS_VIRTIO
config DRIVERS_VIRTIO_PCI_POLLING_PERIOD
int "Virtio PCI Polling Period (us)"
@@ -39,12 +40,14 @@ config DRIVERS_VIRTIO_BLK
bool "Virtio block support"
depends on !DISABLE_MOUNTPOINT
default n
select DRIVERS_VIRTIO
config DRIVERS_VIRTIO_GPU
bool "Virtio gpu support"
default n
depends on VIDEO_FB
select FB_UPDATE
select DRIVERS_VIRTIO
config DRIVERS_VIRTIO_INPUT
bool "Virtio input support"
@@ -53,6 +56,7 @@ config DRIVERS_VIRTIO_INPUT
select INPUT_KEYBOARD
select INPUT_MOUSE
default n
select DRIVERS_VIRTIO
config DRIVERS_VIRTIO_NET
bool "Virtio network support"
@@ -60,6 +64,7 @@ config DRIVERS_VIRTIO_NET
default n
select ARCH_HAVE_NETDEV_STATISTICS
select NETDEV_LATEINIT
select DRIVERS_VIRTIO
config DRIVERS_VIRTIO_NET_BUFNUM
int "Virtio network driver buffer number"
@@ -74,15 +79,18 @@ config DRIVERS_VIRTIO_RNG
bool "Virtio rng support"
default n
select ARCH_HAVE_RNG
select DRIVERS_VIRTIO
config DRIVERS_VIRTIO_RPMB
bool "Virtio RPMB support"
default n
select DRIVERS_VIRTIO
config DRIVERS_VIRTIO_RPMSG
bool "Virtio Rpmsg support"
default n
select RPMSG_VIRTIO
select DRIVERS_VIRTIO
config DRIVERS_VIRTIO_SERIAL
bool "Virtio serial support"
@@ -90,6 +98,7 @@ config DRIVERS_VIRTIO_SERIAL
default n
select SERIAL_RXDMA
select SERIAL_TXDMA
select DRIVERS_VIRTIO
if DRIVERS_VIRTIO_SERIAL
config DRIVERS_VIRTIO_SERIAL_BUFSIZE
@@ -118,6 +127,7 @@ config DRIVERS_VIRTIO_SOUND
bool "Virtio sound support"
default n
depends on DRIVERS_AUDIO
select DRIVERS_VIRTIO
if DRIVERS_VIRTIO_SOUND
config DRIVERS_VIRTIO_SOUND_PERIOD_TIME
@@ -128,5 +138,3 @@ config DRIVERS_VIRTIO_SND_BUFFER_COUNT
int "Virtio snd driver buffer count"
default 6
endif
endif # DRIVERS_VIRTIO