From 2061bbe2a0e29a493a8965e5ce3bc3b03d21760f Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 15 Nov 2011 22:25:37 -0600 Subject: Have sugarbay.conf use the common ia32-base .inc file and remove the open-coded machine settings. Signed-off-by: Tom Zanussi --- meta-sugarbay/conf/machine/sugarbay.conf | 42 ++++---------------------------- 1 file changed, 5 insertions(+), 37 deletions(-) (limited to 'meta-sugarbay') diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf index 0b4541f5..25b3aad0 100644 --- a/meta-sugarbay/conf/machine/sugarbay.conf +++ b/meta-sugarbay/conf/machine/sugarbay.conf @@ -5,41 +5,9 @@ # i.e. Sandy Bridge + Cougar Point 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-intel \ - mesa-dri \ - mesa-dri-driver-i965" - -SERIAL_CONSOLE = "115200 ttyS0" - -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" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_I915} \ + " -- cgit v1.2.3-54-g00ecf