[yocto] [PATCH 09/17] Have fri2-noemgd.conf use the common ia32-base .inc file and remove the open-coded machine settings.
tom.zanussi at intel.com
tom.zanussi at intel.com
Mon Nov 21 14:44:25 PST 2011
From: Tom Zanussi <tom.zanussi at intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
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 d70e06f..1871cad 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -5,43 +5,13 @@
# i.e. E660 + EG20T
include conf/machine/include/tune-atom.inc
+include conf/machine/include/ia32-base.inc
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
- acpi serial usbgadget wifi 3g"
+MACHINE_FEATURES += "wifi 3g"
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.0%"
-
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-XSERVER ?= "xserver-xorg \
- xserver-xorg-extension-dri \
- xserver-xorg-extension-dri2 \
- xserver-xorg-extension-glx \
- xserver-xorg-extension-extmod \
- xserver-xorg-extension-dbe \
- xserver-xorg-module-libint10 \
- xf86-input-mouse \
- xf86-input-keyboard \
- xf86-input-evdev \
- xf86-input-synaptics \
- xf86-video-vesa"
-
-PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
-
-SERIAL_CONSOLE = "115200 ttyS0"
+XSERVER ?= "${XSERVER_IA32_BASE} \
+ ${XSERVER_IA32_EXT} \
+ ${XSERVER_IA32_VESA} \
+ "
APPEND += "video=vesafb vga=0x318"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz live"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
--
1.7.0.4
More information about the yocto
mailing list