From e488dc052ed1c425689d8dde902a4d7b12a5b8b4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 10 Apr 2025 04:29:00 +0200 Subject: riscv: use virtio by default --- target/config/Config.in.qemuopts | 2 -- target/riscv32/Makefile | 2 -- target/riscv64/Makefile | 3 --- 3 files changed, 7 deletions(-) diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index 1e38fa7d7..8de8df429 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -28,8 +28,6 @@ config ADK_TARGET_QEMU_WITH_BLOCK menu "Qemu system configuration" depends on ADK_TARGET_QEMU && (ADK_TARGET_SYSTEM_QEMU_X86_64 \ - || ADK_TARGET_SYSTEM_QEMU_RISCV32 \ - || ADK_TARGET_SYSTEM_QEMU_RISCV64 \ || ADK_TARGET_SYSTEM_QEMU_CSKY \ || ADK_TARGET_SYSTEM_QEMU_X86 \ || ADK_TARGET_SYSTEM_QEMU_ARC \ diff --git a/target/riscv32/Makefile b/target/riscv32/Makefile index 6bcede1ff..1d628402f 100644 --- a/target/riscv32/Makefile +++ b/target/riscv32/Makefile @@ -10,9 +10,7 @@ QEMU_ARGS:=-M virt -m 512 -nographic ifeq ($(ADK_TARGET_WITH_MMU),) QEMU_ARGS+=-bios none -cpu rv32,mmu=off endif -ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -endif ifeq ($(ADK_TARGET_FS),archive) QEMU_ARGS+=-device virtio-blk-device,drive=vda -drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=none,id=vda,format=raw endif diff --git a/target/riscv64/Makefile b/target/riscv64/Makefile index ba5a7749e..4283064e5 100644 --- a/target/riscv64/Makefile +++ b/target/riscv64/Makefile @@ -10,10 +10,7 @@ QEMU_ARGS:=-M virt -m 512 -nographic ifeq ($(ADK_TARGET_WITH_MMU),) QEMU_ARGS+=-bios none -cpu rv64,mmu=off endif - -ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -endif ifeq ($(ADK_TARGET_FS),archive) QEMU_ARGS+=-device virtio-blk-device,drive=vda -drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=none,id=vda,format=raw endif -- cgit v1.2.3