From 8bbe7a8825520577bb7180b1e9c54195a7c8285a Mon Sep 17 00:00:00 2001 From: Masayuki Ishikawa Date: Sat, 1 Jul 2023 11:39:50 +0900 Subject: [PATCH] boards: Enable virtio-blk and FAT for virt configurations Summary: - I noticed that virtio-blk and FAT are not enabled for some virt configurations. - This commit enables them for testing. Impact: - None Testing: - Tested with qemu-7.1 - NOTE: file copy with rv-virt:knetnsh64 is sometimes unstable. Signed-off-by: Masayuki Ishikawa --- boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig | 5 +++++ boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig | 5 +++++ .../risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig | 5 +++++ boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig | 5 +++++ boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig index 5f633494fb..cf829bc745 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig @@ -22,12 +22,17 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=8192 CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y +CONFIG_DRIVERS_VIRTIO_BLK=y CONFIG_DRIVERS_VIRTIO_MMIO_BASE=0x0a000000 CONFIG_DRIVERS_VIRTIO_MMIO_IRQ=48 CONFIG_DRIVERS_VIRTIO_MMIO_NUM=32 CONFIG_DRIVERS_VIRTIO_MMIO_REGSIZE=0x200 CONFIG_DRIVERS_VIRTIO_NET=y CONFIG_EXAMPLES_HELLO=y +CONFIG_FAT_LCNAMES=y +CONFIG_FAT_LFN=y +CONFIG_FS_FAT=y +CONFIG_FS_FATTIME=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig index 87f8b947b3..e089bc5ebd 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig @@ -49,6 +49,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y +CONFIG_DRIVERS_VIRTIO_BLK=y CONFIG_DRIVERS_VIRTIO_MMIO_BASE=0x10001000 CONFIG_DRIVERS_VIRTIO_MMIO_IRQ=26 CONFIG_DRIVERS_VIRTIO_MMIO_NUM=8 @@ -56,6 +57,10 @@ CONFIG_DRIVERS_VIRTIO_MMIO_REGSIZE=0x1000 CONFIG_DRIVERS_VIRTIO_NET=y CONFIG_ELF=y CONFIG_EXAMPLES_HELLO=m +CONFIG_FAT_LCNAMES=y +CONFIG_FAT_LFN=y +CONFIG_FS_FAT=y +CONFIG_FS_FATTIME=y CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=3072 diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig index c702524a43..c9dfc6ee90 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig @@ -49,6 +49,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y +CONFIG_DRIVERS_VIRTIO_BLK=y CONFIG_DRIVERS_VIRTIO_MMIO_BASE=0x10001000 CONFIG_DRIVERS_VIRTIO_MMIO_IRQ=26 CONFIG_DRIVERS_VIRTIO_MMIO_NUM=8 @@ -56,6 +57,10 @@ CONFIG_DRIVERS_VIRTIO_MMIO_REGSIZE=0x1000 CONFIG_DRIVERS_VIRTIO_NET=y CONFIG_ELF=y CONFIG_EXAMPLES_HELLO=m +CONFIG_FAT_LCNAMES=y +CONFIG_FAT_LFN=y +CONFIG_FS_FAT=y +CONFIG_FS_FATTIME=y CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=3072 diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig index 76a4830719..fcbb37e0be 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig @@ -34,6 +34,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y +CONFIG_DRIVERS_VIRTIO_BLK=y CONFIG_DRIVERS_VIRTIO_MMIO_BASE=0x10001000 CONFIG_DRIVERS_VIRTIO_MMIO_IRQ=28 CONFIG_DRIVERS_VIRTIO_MMIO_NUM=8 @@ -41,6 +42,10 @@ CONFIG_DRIVERS_VIRTIO_MMIO_REGSIZE=0x1000 CONFIG_DRIVERS_VIRTIO_NET=y CONFIG_ELF=y CONFIG_EXAMPLES_HELLO=m +CONFIG_FAT_LCNAMES=y +CONFIG_FAT_LFN=y +CONFIG_FS_FAT=y +CONFIG_FS_FATTIME=y CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig index c3eac4dd75..973f00952f 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig @@ -34,6 +34,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y +CONFIG_DRIVERS_VIRTIO_BLK=y CONFIG_DRIVERS_VIRTIO_MMIO_BASE=0x10001000 CONFIG_DRIVERS_VIRTIO_MMIO_IRQ=28 CONFIG_DRIVERS_VIRTIO_MMIO_NUM=8 @@ -41,6 +42,10 @@ CONFIG_DRIVERS_VIRTIO_MMIO_REGSIZE=0x1000 CONFIG_DRIVERS_VIRTIO_NET=y CONFIG_ELF=y CONFIG_EXAMPLES_HELLO=m +CONFIG_FAT_LCNAMES=y +CONFIG_FAT_LFN=y +CONFIG_FS_FAT=y +CONFIG_FS_FATTIME=y CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048