diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-26 11:03:45 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-27 22:45:41 -0700 |
| commit | fb10983b991eaac4a1f4f3578f6891af8cf142db (patch) | |
| tree | f687be7eaca90e9869093d4c94bdfd133d4ded35 | |
| parent | 752435eb3bc525da43eb94659e115156d572b68c (diff) | |
| download | openembedded-core-fb10983b991eaac4a1f4f3578f6891af8cf142db.tar.gz openembedded-core-fb10983b991eaac4a1f4f3578f6891af8cf142db.tar.bz2 openembedded-core-fb10983b991eaac4a1f4f3578f6891af8cf142db.tar.xz openembedded-core-fb10983b991eaac4a1f4f3578f6891af8cf142db.zip | |
qemux86-64: Add new emulation machine for 64bit x86
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 1 | ||||
| -rw-r--r-- | meta/conf/machine/qemux86-64.conf | 35 | ||||
| -rw-r--r-- | meta/packages/linux/linux-wrs_git.bb | 1 |
3 files changed, 37 insertions, 0 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 44723a0a6..f8262fdcf 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" SRCREV_pn-linux-wrs_qemumips ??= "5a7c9d5a35cd43308a2afd212824b670553179af" SRCREV_pn-linux-wrs_qemuppc ??= "bc33a1f5b5703df9ac169835161dc963abc55f6b" SRCREV_pn-linux-wrs_qemux86 ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" +SRCREV_pn-linux-wrs_qemux86-64 ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" SRCREV_pn-matchbox-config-gtk ??= "2081" SRCREV_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 000000000..85d79f686 --- /dev/null +++ b/meta/conf/machine/qemux86-64.conf @@ -0,0 +1,35 @@ +#@TYPE: Machine +#@NAME: common_pc +#@DESCRIPTION: Machine configuration for running a common x86 + +TARGET_ARCH = "x86_64" +PACKAGE_EXTRA_ARCHS = "x86" + +PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" + +require conf/machine/include/qemu.inc + +MACHINE_FEATURES += "x86" + +KERNEL_IMAGETYPE = "bzImage" + +SERIAL_CONSOLE = "115200 ttyS0" + +# We bypass swrast but we need it to be present for X to load correctly +XSERVER ?= "xserver-xf86-dri-lite \ + mesa-dri-driver-swrast \ + xf86-input-vmmouse \ + xf86-input-keyboard \ + xf86-input-evdev \ + xf86-video-vmware \ + qemugl" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "v86d" + +TARGET_CC_ARCH = "-march=core2 -m64" diff --git a/meta/packages/linux/linux-wrs_git.bb b/meta/packages/linux/linux-wrs_git.bb index 3986fc798..d6a81d1a5 100644 --- a/meta/packages/linux/linux-wrs_git.bb +++ b/meta/packages/linux/linux-wrs_git.bb @@ -15,6 +15,7 @@ SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclon WRMACHINE = "${MACHINE}" WRMACHINE_qemux86 = "common_pc" +WRMACHINE_qemux86-64 = "common_pc_64" WRMACHINE_qemuppc = "qemu_ppc32" WRMACHINE_qemumips = "mti_malta32_be" WRMACHINE_qemuarm = "arm_versatile_926ejs" |