Browse Source

fix qemu for x86_64

Waldemar Brodkorb 10 years ago
parent
commit
7be3cd77b3

+ 4 - 0
target/config/Config.in.cpu

@@ -40,6 +40,9 @@ config ADK_TARGET_CPU_WITH_3DNOW
 config ADK_TARGET_CPU_WITH_3DNOWEXT
 	boolean
 
+config ADK_CPU_ATHLON
+	boolean
+
 config ADK_CPU_SH4
 	boolean
 
@@ -105,6 +108,7 @@ config ADK_TARGET_CPU_ARCH
 	string
 	default "x86_64" if ADK_CPU_X86_64
 	default "x86_64" if ADK_CPU_AMDFAM10
+	default "x86_64" if ADK_CPU_ATHLON
 	default "i486" if ADK_CPU_I486
 	default "i586" if ADK_CPU_I586
 	default "i686" if ADK_CPU_I686

+ 2 - 0
target/config/Config.in.target

@@ -11,6 +11,8 @@ config ADK_TARGET_CFLAGS
 	default "-march=i486" if ADK_CPU_I486
 	default "-march=i586" if ADK_CPU_I586
 	default "-march=i686" if ADK_CPU_I686
+	default "-mtune=generic" if ADK_CPU_X86_64
+	default "-march=athlon" if ADK_CPU_ATHLON
 	default "-march=pentium-m" if ADK_CPU_PENTIUM_M
 	default "-march=atom" if ADK_CPU_ATOM
 	default "-march=amdfam10" if ADK_CPU_AMDFAM10

+ 2 - 2
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)

+ 1 - 1
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