diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2011-11-15 22:45:41 -0600 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2011-11-21 09:30:00 -0600 |
commit | 1b996c073fe4d5c9aaf6dea912d476b4f2006641 (patch) | |
tree | 8812f8ffe67156f7f1466fc853cb958e2d60f0d8 /meta-fri2/conf/machine | |
parent | c5060ec3532d993579ebc8314560fd0f04a0c334 (diff) | |
download | meta-intel-1b996c073fe4d5c9aaf6dea912d476b4f2006641.tar.gz |
Have fri2-noemgd.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-fri2/conf/machine')
-rw-r--r-- | meta-fri2/conf/machine/fri2-noemgd.conf | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf index d70e06ff..1871cad6 100644 --- a/meta-fri2/conf/machine/fri2-noemgd.conf +++ b/meta-fri2/conf/machine/fri2-noemgd.conf | |||
@@ -5,43 +5,13 @@ | |||
5 | # i.e. E660 + EG20T | 5 | # i.e. E660 + EG20T |
6 | 6 | ||
7 | include conf/machine/include/tune-atom.inc | 7 | include conf/machine/include/tune-atom.inc |
8 | include conf/machine/include/ia32-base.inc | ||
8 | 9 | ||
9 | MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ | 10 | MACHINE_FEATURES += "wifi 3g" |
10 | acpi serial usbgadget wifi 3g" | ||
11 | 11 | ||
12 | KERNEL_IMAGETYPE = "bzImage" | 12 | XSERVER ?= "${XSERVER_IA32_BASE} \ |
13 | 13 | ${XSERVER_IA32_EXT} \ | |
14 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 14 | ${XSERVER_IA32_VESA} \ |
15 | PREFERRED_VERSION_linux-yocto ?= "3.0%" | 15 | " |
16 | |||
17 | PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" | ||
18 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" | ||
19 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" | ||
20 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | ||
21 | XSERVER ?= "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 | |||
34 | PREFERRED_VERSION_xserver-xorg ?= "1.11.1" | ||
35 | |||
36 | SERIAL_CONSOLE = "115200 ttyS0" | ||
37 | 16 | ||
38 | APPEND += "video=vesafb vga=0x318" | 17 | APPEND += "video=vesafb vga=0x318" |
39 | |||
40 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" | ||
41 | |||
42 | IMAGE_FSTYPES ?= "ext3 cpio.gz live" | ||
43 | |||
44 | GLIBC_ADDONS = "nptl" | ||
45 | GLIBC_EXTRA_OECONF = "--with-tls" | ||
46 | |||
47 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" | ||