From 7be3cd77b3f6a69a49fb7706efc23ea62e6f710c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 25 May 2014 19:53:55 +0200
Subject: fix qemu for x86_64

---
 target/x86_64/Makefile            | 4 ++--
 target/x86_64/systems/qemu-x86_64 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'target/x86_64')

diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile
index ee581c751..ccb8c9766 100644
--- a/target/x86_64/Makefile
+++ b/target/x86_64/Makefile
@@ -34,9 +34,9 @@ ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
 ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y)
-	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} qemu-${CPU_ARCH}.img'
 else
-	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
 endif
 endif
 ifeq ($(ADK_HARDWARE_VBOX),y)
diff --git a/target/x86_64/systems/qemu-x86_64 b/target/x86_64/systems/qemu-x86_64
index 11e5c92cb..78e82294a 100644
--- a/target/x86_64/systems/qemu-x86_64
+++ b/target/x86_64/systems/qemu-x86_64
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64
 	bool "Qemu Emulator"
 	select ADK_x86_64
 	select ADK_qemu_x86_64
-	select ADK_CPU_X86_64
+	select ADK_CPU_ATHLON
 	select ADK_LINUX_64
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_BZIMAGE
-- 
cgit v1.2.3