summaryrefslogtreecommitdiffstats
path: root/meta-sugarbay/conf
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-11-16 04:25:37 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-11-21 15:30:00 (GMT)
commit2061bbe2a0e29a493a8965e5ce3bc3b03d21760f (patch)
tree061324d2d4418fdcfc1c8ce997028b9d328ff86d /meta-sugarbay/conf
parent9e032536dc895ee5f0c577bf00aa9d7d52b8afa3 (diff)
downloadmeta-intel-2061bbe2a0e29a493a8965e5ce3bc3b03d21760f.tar.gz
Have sugarbay.conf use the common ia32-base .inc file and remove the
open-coded machine settings. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-sugarbay/conf')
-rw-r--r--meta-sugarbay/conf/machine/sugarbay.conf42
1 files changed, 5 insertions, 37 deletions
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index 0b4541f..25b3aad 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -5,41 +5,9 @@
5# i.e. Sandy Bridge + Cougar Point 5# i.e. Sandy Bridge + Cougar Point
6 6
7require conf/machine/include/tune-x86_64.inc 7require conf/machine/include/tune-x86_64.inc
8require conf/machine/include/ia32-base.inc
8 9
9MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ 10XSERVER ?= "${XSERVER_IA32_BASE} \
10 acpi serial usbgadget" 11 ${XSERVER_IA32_EXT} \
11 12 ${XSERVER_IA32_I915} \
12KERNEL_IMAGETYPE = "bzImage" 13 "
13
14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
15PREFERRED_VERSION_linux-yocto = "3.0%"
16
17PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
19PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
20PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
21XSERVER ?= "xserver-xorg \
22 xserver-xorg-extension-dri \
23 xserver-xorg-extension-dri2 \
24 xserver-xorg-extension-glx \
25 xserver-xorg-extension-extmod \
26 xserver-xorg-extension-dbe \
27 xserver-xorg-module-libint10 \
28 xf86-input-mouse \
29 xf86-input-keyboard \
30 xf86-input-evdev \
31 xf86-input-synaptics \
32 xf86-video-intel \
33 mesa-dri \
34 mesa-dri-driver-i965"
35
36SERIAL_CONSOLE = "115200 ttyS0"
37
38MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
39
40IMAGE_FSTYPES ?= "ext3 cpio.gz live"
41
42GLIBC_ADDONS = "nptl"
43GLIBC_EXTRA_OECONF = "--with-tls"
44
45MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"