From c5060ec3532d993579ebc8314560fd0f04a0c334 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 15 Nov 2011 22:43:18 -0600 Subject: Have fri2.conf use the common ia32-base .inc file and remove the open-coded machine settings. Signed-off-by: Tom Zanussi --- meta-fri2/conf/machine/fri2.conf | 42 +++++++--------------------------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 80fa43b9..15036a4c 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf @@ -5,45 +5,17 @@ # 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 \ - emgd-driver-bin" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_EMGD} \ + " PREFERRED_VERSION_xserver-xorg ?= "1.9.3" +PREFERRED_VERSION_mesa-dri ?= "7.11" PREFERRED_VERSION_emgd-driver-bin ?= "1.8" -SERIAL_CONSOLE = "115200 ttyS0" - 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" - -- cgit v1.2.3-54-g00ecf