summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-11-16 04:43:18 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-11-21 15:30:00 (GMT)
commitc5060ec3532d993579ebc8314560fd0f04a0c334 (patch)
tree4f4f53dfff0497e85604829bb8e4438629465d89
parent9d607dd3c98de81925dfef12a182e746f8f5331b (diff)
downloadmeta-intel-c5060ec3532d993579ebc8314560fd0f04a0c334.tar.gz
Have fri2.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-fri2/conf/machine/fri2.conf42
1 files changed, 7 insertions, 35 deletions
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 80fa43b..15036a4 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -5,45 +5,17 @@
5# i.e. E660 + EG20T 5# i.e. E660 + EG20T
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 \ 10MACHINE_FEATURES += "wifi 3g"
10 acpi serial usbgadget wifi 3g"
11 11
12KERNEL_IMAGETYPE = "bzImage" 12XSERVER ?= "${XSERVER_IA32_BASE} \
13 13 ${XSERVER_IA32_EXT} \
14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 14 ${XSERVER_IA32_EMGD} \
15PREFERRED_VERSION_linux-yocto ?= "3.0%" 15 "
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 emgd-driver-bin"
33 16
34PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 17PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
18PREFERRED_VERSION_mesa-dri ?= "7.11"
35PREFERRED_VERSION_emgd-driver-bin ?= "1.8" 19PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
36 20
37SERIAL_CONSOLE = "115200 ttyS0"
38
39APPEND += "video=vesafb vga=0x318" 21APPEND += "video=vesafb vga=0x318"
40
41MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
42
43IMAGE_FSTYPES ?= "ext3 cpio.gz live"
44
45GLIBC_ADDONS = "nptl"
46GLIBC_EXTRA_OECONF = "--with-tls"
47
48MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
49