From: Tom Zanussi <[email protected]> Have crownbay.conf and crownbay-noemgd.conf use the common-bsp-* .inc files and remove the open-coded machine settings.
Signed-off-by: Tom Zanussi <[email protected]> --- meta-crownbay/conf/machine/crownbay-noemgd.conf | 19 ++----------------- meta-crownbay/conf/machine/crownbay.conf | 19 ++----------------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf index cc0b2eb..5abdd3d 100644 --- a/meta-crownbay/conf/machine/crownbay-noemgd.conf +++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf @@ -8,29 +8,14 @@ TARGET_ARCH = "i586" include conf/machine/include/tune-atom.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget" - -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 \ xf86-input-evdev \ xf86-input-synaptics \ xf86-video-vesa" - -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" diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index c66b859..8469011 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf @@ -8,17 +8,11 @@ TARGET_ARCH = "i586" include conf/machine/include/tune-atom.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget" - -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 \ emgd-driver-bin \ xf86-input-mouse \ @@ -29,12 +23,3 @@ XSERVER ?= "xserver-xf86-dri-lite \ PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3" PREFERRED_VERSION_emgd-driver-bin ?= "1.6" - -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" -- 1.7.0.4 _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
