summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-11-16 04:36:05 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-11-21 15:30:00 (GMT)
commit663519b22554ce423115c5b054f10c5d6182823e (patch)
treea0bfdb51c5ff3c7164446bb7ab46a6e60359edca
parent81df5d315d45b07589da8fc6cefcc3cb8870f8cd (diff)
downloadmeta-intel-663519b22554ce423115c5b054f10c5d6182823e.tar.gz
Have crownbay.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-crownbay/conf/machine/crownbay.conf42
1 files changed, 6 insertions, 36 deletions
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 9315e82..a57cc1c 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -5,45 +5,15 @@
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 \ 10XSERVER ?= "${XSERVER_IA32_BASE} \
10 acpi serial usbgadget" 11 ${XSERVER_IA32_EXT} \
11 12 ${XSERVER_IA32_EMGD} \
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 emgd-driver-bin \
29 xf86-input-mouse \
30 xf86-input-keyboard \
31 xf86-input-evdev \
32 xf86-input-synaptics \
33 xf86-video-vesa"
34 14
35PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 15PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
16PREFERRED_VERSION_mesa-dri ?= "7.11"
36PREFERRED_VERSION_emgd-driver-bin ?= "1.8" 17PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
37 18
38SERIAL_CONSOLE = "115200 ttyS0"
39
40APPEND += "video=vesafb vga=0x318" 19APPEND += "video=vesafb vga=0x318"
41
42MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
43
44IMAGE_FSTYPES ?= "ext3 cpio.gz live"
45
46GLIBC_ADDONS = "nptl"
47GLIBC_EXTRA_OECONF = "--with-tls"
48
49MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"