summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp/conf/machine/genericx86.conf
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-09-04 21:20:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-06 23:18:34 +0100
commit310f89aee4d09174fa3cb0cd1082241f97de97d3 (patch)
treef32cb49fe830d5270fc71a0f98a531774390fb7d /meta-yocto-bsp/conf/machine/genericx86.conf
parent82ddcb1ef56d364512515c347baa1c5bd74d483f (diff)
downloadpoky-310f89aee4d09174fa3cb0cd1082241f97de97d3.tar.gz
genericx86: Create a genericx86-common.inc base for the x86 BSPs
The genericx86 and genericx86-64 machines share a great deal in common in terms of machine features, required packages, etc. Use a common include file to simplify changes to both machine definitions and avoid accidental omissions. Replace the hard-coded XSERVER assignment with the XSERVER_IA32* defines from ia32-base.inc. (From meta-yocto rev: c70ee30da060173f51e8dba72069052ecff389b5) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Ross Burton <ross.burton@intel.com> Cc: yunguo.wei@windriver.com Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/conf/machine/genericx86.conf')
-rw-r--r--meta-yocto-bsp/conf/machine/genericx86.conf31
1 files changed, 1 insertions, 30 deletions
diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf
index ff5cbc9cc8..9d29f6203b 100644
--- a/meta-yocto-bsp/conf/machine/genericx86.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86.conf
@@ -4,33 +4,4 @@
4#@DESCRIPTION: Machine configuration for generic X86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. 4#@DESCRIPTION: Machine configuration for generic X86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware.
5 5
6include conf/machine/include/tune-atom.inc 6include conf/machine/include/tune-atom.inc
7 7include conf/machine/include/genericx86-common.inc
8MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa"
9
10KERNEL_IMAGETYPE = "bzImage"
11
12PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
13PREFERRED_VERSION_linux-yocto ?= "3.10%"
14PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
15XSERVER ?= "xserver-xorg \
16 xserver-xorg-extension-glx \
17 xf86-input-mouse \
18 xf86-input-keyboard \
19 xf86-input-evdev \
20 xf86-input-synaptics \
21 xf86-video-fbdev \
22 xf86-video-modesetting \
23 xf86-video-vesa \
24 xf86-video-intel \
25 mesa-driver-i915 \
26 mesa-driver-i965"
27
28#MACHINE_EXTRA_RDEPENDS = "rt2860"
29
30MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d"
31
32IMAGE_FSTYPES ?= "ext3 cpio.gz live"
33
34GLIBC_ADDONS = "nptl"
35
36EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"