From: Tom Zanussi <tom.zanussi@...>
Have sugarbay.conf use the common-bsp-* .inc files and remove the
open-coded machine settings.
Signed-off-by: Tom Zanussi <tom.zanussi@...>
---
meta-sugarbay/conf/machine/sugarbay.conf | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index ebc6dbc..ed82506 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -9,18 +9,14 @@ PACKAGE_EXTRA_ARCHS = "x86 snb"
BASE_PACKAGE_ARCH="snb"
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
- acpi serial usbgadget"
+TARGET_CC_ARCH = "-m64"
-KERNEL_IMAGETYPE = "bzImage"
+include ../common/common-bsp-mach.inc
+include ../common/common-bsp-x.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
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-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
XSERVER ?= "xserver-xf86-dri-lite \
xf86-input-mouse \
xf86-input-keyboard \
@@ -30,17 +26,5 @@ XSERVER ?= "xserver-xf86-dri-lite \
mesa-dri \
mesa-dri-driver-i965"
-SERIAL_CONSOLE = "115200 ttyS0"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
-
-TARGET_CC_ARCH = "-m64"
-
PREFERRED_VERSION_grub ?= "1.98"
--
1.7.0.4
