From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 0BF00E0071B for ; Sat, 19 Nov 2011 20:12:30 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 19 Nov 2011 20:12:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.69,541,1315206000"; d="scan'208";a="93221738" Received: from unknown (HELO localhost) ([10.255.15.232]) by fmsmga002.fm.intel.com with ESMTP; 19 Nov 2011 20:12:24 -0800 From: tom.zanussi@intel.com To: yocto@yoctoproject.org Date: Sat, 19 Nov 2011 22:16:01 -0600 Message-Id: <383eb26faf219b86e9152ac348f9eefbe96fe38c.1321762384.git.tom.zanussi@intel.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 11/14] Have n450.conf use the common ia32-base .inc file and remove the open-coded machine settings. X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Nov 2011 04:12:30 -0000 From: Tom Zanussi Signed-off-by: Tom Zanussi --- meta-n450/conf/machine/n450.conf | 39 +++++-------------------------------- 1 files changed, 6 insertions(+), 33 deletions(-) diff --git a/meta-n450/conf/machine/n450.conf b/meta-n450/conf/machine/n450.conf index b28f57f..7210da8 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" - -- 1.7.0.4