From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 19434E0070D for ; Sat, 19 Nov 2011 20:12:24 -0800 (PST) Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga102.ch.intel.com with ESMTP; 19 Nov 2011 20:12:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.69,540,1315206000"; d="scan'208";a="39417355" Received: from unknown (HELO localhost) ([10.255.15.232]) by AZSMGA002.ch.intel.com with ESMTP; 19 Nov 2011 20:12:23 -0800 From: tom.zanussi@intel.com To: yocto@yoctoproject.org Date: Sat, 19 Nov 2011 22:16:00 -0600 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 10/14] Have jasperforest.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:24 -0000 From: Tom Zanussi Signed-off-by: Tom Zanussi --- meta-jasperforest/conf/machine/jasperforest.conf | 41 +++------------------- 1 files changed, 5 insertions(+), 36 deletions(-) diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf index c668c64..9767010 100644 --- a/meta-jasperforest/conf/machine/jasperforest.conf +++ b/meta-jasperforest/conf/machine/jasperforest.conf @@ -5,42 +5,11 @@ # systems i.e. Xeon C5500/C3500 + Intel 3420 chipset (Ibex Peak) require conf/machine/include/tune-x86_64.inc +require 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_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" - -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