summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-07-26 11:03:45 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-27 22:45:41 -0700
commitfb10983b991eaac4a1f4f3578f6891af8cf142db (patch)
treef687be7eaca90e9869093d4c94bdfd133d4ded35 /meta/conf
parent752435eb3bc525da43eb94659e115156d572b68c (diff)
downloadpoky-fb10983b991eaac4a1f4f3578f6891af8cf142db.tar.gz
qemux86-64: Add new emulation machine for 64bit x86
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc1
-rw-r--r--meta/conf/machine/qemux86-64.conf35
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 44723a0a6d..f8262fdcfb 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -72,6 +72,7 @@ SRCREV_pn-linux-wrs_qemuarm ??= "caf3b232f003ac136f0fc99143cac027863af74b"
72SRCREV_pn-linux-wrs_qemumips ??= "5a7c9d5a35cd43308a2afd212824b670553179af" 72SRCREV_pn-linux-wrs_qemumips ??= "5a7c9d5a35cd43308a2afd212824b670553179af"
73SRCREV_pn-linux-wrs_qemuppc ??= "bc33a1f5b5703df9ac169835161dc963abc55f6b" 73SRCREV_pn-linux-wrs_qemuppc ??= "bc33a1f5b5703df9ac169835161dc963abc55f6b"
74SRCREV_pn-linux-wrs_qemux86 ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" 74SRCREV_pn-linux-wrs_qemux86 ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
75SRCREV_pn-linux-wrs_qemux86-64 ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
75SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" 76SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
76SRCREV_pn-matchbox-config-gtk ??= "2081" 77SRCREV_pn-matchbox-config-gtk ??= "2081"
77SRCREV_pn-matchbox-desktop-sato ??= "76" 78SRCREV_pn-matchbox-desktop-sato ??= "76"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
new file mode 100644
index 0000000000..85d79f686f
--- /dev/null
+++ b/meta/conf/machine/qemux86-64.conf
@@ -0,0 +1,35 @@
1#@TYPE: Machine
2#@NAME: common_pc
3#@DESCRIPTION: Machine configuration for running a common x86
4
5TARGET_ARCH = "x86_64"
6PACKAGE_EXTRA_ARCHS = "x86"
7
8PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
9PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
10PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
11PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
12
13require conf/machine/include/qemu.inc
14
15MACHINE_FEATURES += "x86"
16
17KERNEL_IMAGETYPE = "bzImage"
18
19SERIAL_CONSOLE = "115200 ttyS0"
20
21# We bypass swrast but we need it to be present for X to load correctly
22XSERVER ?= "xserver-xf86-dri-lite \
23 mesa-dri-driver-swrast \
24 xf86-input-vmmouse \
25 xf86-input-keyboard \
26 xf86-input-evdev \
27 xf86-video-vmware \
28 qemugl"
29
30GLIBC_ADDONS = "nptl"
31GLIBC_EXTRA_OECONF = "--with-tls"
32
33MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "v86d"
34
35TARGET_CC_ARCH = "-march=core2 -m64"