From 802123a425fd9a5e6fd0d62063a9719811782767 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 12 Nov 2015 23:05:30 +0100 Subject: qemu-sparc64: switch to e1000 driver (idea from buildroot), move serial symbols. --- target/sparc64/Makefile | 2 ++ target/sparc64/kernel/qemu-sparc64 | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'target/sparc64') diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 7d52b3fca..9a224a430 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -14,6 +14,8 @@ QEMU_ARGS+=-net nic,model=virtio -net user ifeq ($(ADK_TARGET_FS),archive) QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio endif +else +QEMU_ARGS+=-net nic,model=e1000 -net user endif # target helper text diff --git a/target/sparc64/kernel/qemu-sparc64 b/target/sparc64/kernel/qemu-sparc64 index 53191c99f..67abdc67f 100644 --- a/target/sparc64/kernel/qemu-sparc64 +++ b/target/sparc64/kernel/qemu-sparc64 @@ -6,9 +6,5 @@ CONFIG_OF=y CONFIG_OF_PROMTREE=y CONFIG_OF_NET=y CONFIG_OF_PCI=y -CONFIG_IOMMU_SUPPORT=y CONFIG_OF_IOMMU=y -CONFIG_SERIAL_CONSOLE=y -CONFIG_SERIAL_SUNCORE=y -CONFIG_SERIAL_SUNSU=y -CONFIG_SERIAL_SUNSU_CONSOLE=y +CONFIG_IOMMU_SUPPORT=y -- cgit v1.2.3