From 0d39ed8727fca64e0a3ea428c4977d8a1a9ad2c8 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 15 Nov 2011 23:01:39 -0600 Subject: Have emenlow.conf use the common ia32-base .inc file and remove the open-coded machine settings. Signed-off-by: Tom Zanussi --- meta-emenlow/conf/machine/emenlow.conf | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'meta-emenlow') diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf index 06cba370..5a14b260 100644 --- a/meta-emenlow/conf/machine/emenlow.conf +++ b/meta-emenlow/conf/machine/emenlow.conf @@ -5,21 +5,14 @@ # Webs-2120 box. 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" - -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_libdrm = "libdrm-poulsbo" PREFERRED_PROVIDER_drm = "libdrm-poulsbo" PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx" PREFERRED_PROVIDER_virtual/xserver = "xserver-psb" +PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb" PREFERRED_PROVIDER_mesa-dri = "xpsb-glx" XSERVER ?= "xserver-psb \ xserver-psb-extension-dri \ @@ -32,16 +25,4 @@ XSERVER ?= "xserver-psb \ xf86-input-keyboard \ xf86-input-evdev" -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