summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-25 19:53:55 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-25 19:54:50 +0200
commit7be3cd77b3f6a69a49fb7706efc23ea62e6f710c (patch)
tree064065dcd40a12fcd3750388e39187786eea990e /target
parenta3683ced3cb25013c042c5c9534b4bc82c47196c (diff)
fix qemu for x86_64
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.cpu4
-rw-r--r--target/config/Config.in.target2
-rw-r--r--target/x86_64/Makefile4
-rw-r--r--target/x86_64/systems/qemu-x86_642
4 files changed, 9 insertions, 3 deletions
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index a079b8c9f..3d4edc056 100644
--- a/target/config/Config.in.cpu
+++ b/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
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index 62fb897ea..edccae715 100644
--- a/target/config/Config.in.target
+++ b/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
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