summaryrefslogtreecommitdiffstats
path: root/meta-fishriver
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-11-16 04:31:48 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-11-21 15:30:00 (GMT)
commit81df5d315d45b07589da8fc6cefcc3cb8870f8cd (patch)
treebc24f9e75470d7d8174b2c6b983816f06be3bc0b /meta-fishriver
parent2061bbe2a0e29a493a8965e5ce3bc3b03d21760f (diff)
downloadmeta-intel-81df5d315d45b07589da8fc6cefcc3cb8870f8cd.tar.gz
Have fishriver.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-fishriver')
-rw-r--r--meta-fishriver/conf/machine/fishriver.conf41
1 files changed, 5 insertions, 36 deletions
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index 8cc43f8..b43282e 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -5,42 +5,11 @@
5# i.e. Z530/E660 + EG20T 5# i.e. Z530/E660 + EG20T
6 6
7include conf/machine/include/tune-atom.inc 7include conf/machine/include/tune-atom.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_VESA} \
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-vesa"
33
34SERIAL_CONSOLE = "115200 ttyS0"
35 14
36APPEND += "video=vesafb vga=0x318" 15APPEND += "video=vesafb vga=0x318"
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"
46