From 6f65f6e44b48adc43c299c0d5927eadcfea748f4 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 15 Nov 2011 22:55:01 -0600 Subject: Have n450.conf use the common ia32-base .inc file and remove the open-coded machine settings. Signed-off-by: Tom Zanussi --- meta-n450/conf/machine/n450.conf | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/meta-n450/conf/machine/n450.conf b/meta-n450/conf/machine/n450.conf index b28f57f3..7210da8c 100644 --- a/meta-n450/conf/machine/n450.conf +++ b/meta-n450/conf/machine/n450.conf @@ -4,44 +4,17 @@ #@DESCRIPTION: Machine configuration for Intel 1-N450 based systems 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" - -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-intel \ - mesa-dri-driver-i915" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_I915} \ + " SYSLINUX_OPTS = "serial 0 115200" SERIAL_CONSOLE = "115200 ttyS0" APPEND += "console=ttyS0,115200 console=tty0" -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts n450-audio" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" +MACHINE_EXTRA_RRECOMMENDS += "n450-audio" ROOTLESS_X = "1" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" - -- cgit v1.2.3-54-g00ecf