diff options
| author | Jun Nakajima <jnakajim@gmail.com> | 2011-02-02 23:49:59 -0800 |
|---|---|---|
| committer | Jun Nakajima <jnakajim@gmail.com> | 2011-02-02 23:49:59 -0800 |
| commit | 334ab475d2f27dbf6fbf836c2d4fb86dbb02a15c (patch) | |
| tree | 31739daf9666b860cac11a6af58ec7d0cfb59bd4 /android/config | |
| parent | 65842c595f20efb0522fe3684716388bc1e87477 (diff) | |
| download | external_qemu-334ab475d2f27dbf6fbf836c2d4fb86dbb02a15c.zip external_qemu-334ab475d2f27dbf6fbf836c2d4fb86dbb02a15c.tar.gz external_qemu-334ab475d2f27dbf6fbf836c2d4fb86dbb02a15c.tar.bz2 | |
x86: Add x86 support. Rebase the change (20906/1) due to a minor conflict.
Change-Id: Ic73cca0fc6c6e5cf74f63daa6080d00aa7c392bb
Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com>
Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Diffstat (limited to 'android/config')
| -rw-r--r-- | android/config/config.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/android/config/config.h b/android/config/config.h index 7ceac69..fdfbe31 100644 --- a/android/config/config.h +++ b/android/config/config.h @@ -1,16 +1,23 @@ /* Automatically generated by configure - do not modify */ #include "config-host.h" -#define CONFIG_QEMU_PREFIX "/usr/gnemul/qemu-arm" -#define TARGET_ARCH "arm" -#define TARGET_ARM 1 + #define TARGET_PHYS_ADDR_BITS 32 #define CONFIG_TRACE 1 #define CONFIG_NAND 1 #define CONFIG_SHAPER 1 #define CONFIG_SOFTMMU 1 -#define CONFIG_SOFTFLOAT 1 #define CONFIG_SDL 1 #ifndef _WIN32 #define CONFIG_NAND_LIMITS 1 #endif #define CONFIG_ANDROID_SNAPSHOTS 1 + +#ifdef ARCH_FLAGS_x86 +#define TARGET_ARCH "x86" +#define TARGET_I386 1 +#else +#define TARGET_ARCH "arm" +#define TARGET_ARM 1 +#define CONFIG_SOFTFLOAT 1 +#endif + |