diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-09-15 09:03:18 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-09-15 09:03:18 -0700 |
| commit | 497d910c85598a75cc2be2ea932c44036c854fc3 (patch) | |
| tree | 567e8ce139138e5d6bcb8f14e86dc3cb99a0df1e /android/config | |
| parent | a3abe794b734382295b89d6c2d1d176ce4bb9b4b (diff) | |
| parent | 5d8f37ad78fc66901af50c762029a501561f3b23 (diff) | |
| download | external_qemu-497d910c85598a75cc2be2ea932c44036c854fc3.zip external_qemu-497d910c85598a75cc2be2ea932c44036c854fc3.tar.gz external_qemu-497d910c85598a75cc2be2ea932c44036c854fc3.tar.bz2 | |
resolved conflicts for merge of 5d8f37ad to eclair-plus-aosp
Diffstat (limited to 'android/config')
| -rw-r--r-- | android/config/Linux/config-host.h | 1 | ||||
| -rw-r--r-- | android/config/config.h | 1 | ||||
| -rw-r--r-- | android/config/darwin-x86/config-host.h | 4 | ||||
| -rw-r--r-- | android/config/linux-x86/config-host.h | 5 | ||||
| -rw-r--r-- | android/config/windows/config-host.h | 3 |
5 files changed, 11 insertions, 3 deletions
diff --git a/android/config/Linux/config-host.h b/android/config/Linux/config-host.h index 90defbd..cc5e07a 100644 --- a/android/config/Linux/config-host.h +++ b/android/config/Linux/config-host.h @@ -6,5 +6,6 @@ #define CONFIG_GDBSTUB 1 #define CONFIG_SLIRP 1 #define QEMU_VERSION "0.8.2" +#define QEMU_PKGVERSION "Android" #define CONFIG_SKINS 1 #define CONFIG_UNAME_RELEASE "" diff --git a/android/config/config.h b/android/config/config.h index be83607..e2191e3 100644 --- a/android/config/config.h +++ b/android/config/config.h @@ -3,6 +3,7 @@ #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 diff --git a/android/config/darwin-x86/config-host.h b/android/config/darwin-x86/config-host.h index aaf0195..23ccb13 100644 --- a/android/config/darwin-x86/config-host.h +++ b/android/config/darwin-x86/config-host.h @@ -5,9 +5,11 @@ #define CONFIG_DARWIN 1 #define CONFIG_GDBSTUB 1 #define CONFIG_SLIRP 1 -#define QEMU_VERSION "0.8.2" +#define QEMU_VERSION "0.10.50" +#define QEMU_PKGVERSION "Android" #define O_LARGEFILE 0 #define MAP_ANONYMOUS MAP_ANON +#define HAVE_IOVEC 1 #define _BSD 1 #define CONFIG_SKINS 1 #define CONFIG_UNAME_RELEASE "" diff --git a/android/config/linux-x86/config-host.h b/android/config/linux-x86/config-host.h index 90defbd..7e2ed20 100644 --- a/android/config/linux-x86/config-host.h +++ b/android/config/linux-x86/config-host.h @@ -5,6 +5,9 @@ #define HAVE_BYTESWAP_H 1 #define CONFIG_GDBSTUB 1 #define CONFIG_SLIRP 1 -#define QEMU_VERSION "0.8.2" +#define QEMU_VERSION "0.10.50" +#define QEMU_PKGVERSION "Android" #define CONFIG_SKINS 1 #define CONFIG_UNAME_RELEASE "" +#define CONFIG_IOTHREAD 1 +#define HAVE_IOVEC 1 diff --git a/android/config/windows/config-host.h b/android/config/windows/config-host.h index 8f9e0d9..6e18a02 100644 --- a/android/config/windows/config-host.h +++ b/android/config/windows/config-host.h @@ -5,6 +5,7 @@ #define CONFIG_WIN32 1 #define CONFIG_GDBSTUB 1 #define CONFIG_SLIRP 1 -#define QEMU_VERSION "0.8.2" +#define QEMU_VERSION "0.10.50" +#define QEMU_PKGVERSION "Android" #define CONFIG_SKINS 1 #define CONFIG_UNAME_RELEASE "" |