summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-11-16 05:01:39 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-11-21 15:30:00 (GMT)
commit0d39ed8727fca64e0a3ea428c4977d8a1a9ad2c8 (patch)
treeba6137720ffd63fa6d6323c1c27fcf02ac537759
parent33667aa9ef5e46b2699fcc728d98d66b76c530a2 (diff)
downloadmeta-intel-0d39ed8727fca64e0a3ea428c4977d8a1a9ad2c8.tar.gz
Have emenlow.conf use the common ia32-base .inc file and remove the
open-coded machine settings. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-emenlow/conf/machine/emenlow.conf23
1 files changed, 2 insertions, 21 deletions
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index 06cba37..5a14b26 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -5,21 +5,14 @@
5# Webs-2120 box. 5# Webs-2120 box.
6 6
7include conf/machine/include/tune-atom.inc 7include conf/machine/include/tune-atom.inc
8include conf/machine/include/ia32-base.inc
8 9
9MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
10 acpi serial usbgadget"
11
12KERNEL_IMAGETYPE = "bzImage"
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_libdrm = "libdrm-poulsbo" 10PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo"
19PREFERRED_PROVIDER_drm = "libdrm-poulsbo" 11PREFERRED_PROVIDER_drm = "libdrm-poulsbo"
20PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" 12PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
21PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx" 13PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx"
22PREFERRED_PROVIDER_virtual/xserver = "xserver-psb" 14PREFERRED_PROVIDER_virtual/xserver = "xserver-psb"
15PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb"
23PREFERRED_PROVIDER_mesa-dri = "xpsb-glx" 16PREFERRED_PROVIDER_mesa-dri = "xpsb-glx"
24XSERVER ?= "xserver-psb \ 17XSERVER ?= "xserver-psb \
25 xserver-psb-extension-dri \ 18 xserver-psb-extension-dri \
@@ -32,16 +25,4 @@ XSERVER ?= "xserver-psb \
32 xf86-input-keyboard \ 25 xf86-input-keyboard \
33 xf86-input-evdev" 26 xf86-input-evdev"
34 27
35SERIAL_CONSOLE = "115200 ttyS0"
36
37APPEND += "video=vesafb vga=0x318" 28APPEND += "video=vesafb vga=0x318"
38
39MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
40
41IMAGE_FSTYPES ?= "ext3 cpio.gz live"
42
43GLIBC_ADDONS = "nptl"
44GLIBC_EXTRA_OECONF = "--with-tls"
45
46MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
47