From 1c698117789ea48479e3efd7106096382201d744 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 13 Aug 2014 18:00:56 +0200 Subject: fix networkin in qemu-system-aarch64 --- target/aarch64/Makefile | 2 +- target/linux/config/Config.in.virtio | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/target/aarch64/Makefile b/target/aarch64/Makefile index cd4fb8f9a..a423be3f2 100644 --- a/target/aarch64/Makefile +++ b/target/aarch64/Makefile @@ -12,7 +12,7 @@ KERNEL:=${LINUX_DIR}/arch/arm64/boot/Image QEMU_ARGS:=${ADK_QEMU_ARGS} QEMU_ARGS+=-M virt -cpu cortex-a57 -smp 1 ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) -QEMU_ARGS+=-net nic,model=virtio -net user +QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-device,netdev=eth0 endif ifeq ($(ADK_TARGET_FS),archive) QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio,index=0 diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio index 91e712d5c..c7355ba4d 100644 --- a/target/linux/config/Config.in.virtio +++ b/target/linux/config/Config.in.virtio @@ -1,6 +1,4 @@ menu "Virtio driver support" -depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_TARGET_QEMU -depends on !ADK_TARGET_SYSTEM_QEMU_ARM config ADK_KERNEL_VIRTIO boolean @@ -8,10 +6,14 @@ config ADK_KERNEL_VIRTIO config ADK_KERNEL_VIRTIO_PCI boolean +config ADK_KERNEL_VIRTIO_MMIO + boolean + config ADK_KERNEL_VIRTIO_NET prompt "Virtio net driver" tristate select ADK_KERNEL_VIRTIO + select ADK_KERNEL_VIRTIO_MMIO select ADK_KERNEL_VIRTIO_PCI default n help @@ -22,6 +24,7 @@ config ADK_KERNEL_VIRTIO_BLK tristate select ADK_KERNEL_VIRTIO select ADK_KERNEL_VIRTIO_PCI + select ADK_KERNEL_VIRTIO_MMIO select ADK_KERNEL_BLK_DEV default n help -- cgit v1.2.3