2 files changed, 52 insertions, 4 deletions

diff --git a/meta-cedartrail/conf/machine/cedartrail-nopvr.conf b/meta-cedartrail/conf/machine/cedartrail-nopvr.conf
new file mode 100644
index 00000000..b664272f
--- /dev/null
+++ b/meta-cedartrail/conf/machine/cedartrail-nopvr.conf
@@ -0,0 +1,41 @@
+#@TYPE: Machine
+#@NAME: Cedartrail-nopvr 
+
+#@DESCRIPTION: Machine configuration for Cedartrail systems
+# i.e. Cedarview (N2600, N2800 and D2700) processor +
+# Tiger Point (Intel® NM10 Express) Chipset
+
+include conf/machine/include/tune-atom.inc
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
+                    acpi serial usbgadget alsa"
+
+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-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"
+
+SYSLINUX_OPTS = "serial 3 115200"
+SERIAL_CONSOLE = "115200 ttyS3"
+APPEND += "console=ttyS3,115200 console=tty3"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts cedartrail-audio"
+
+IMAGE_FSTYPES ?= "ext3 cpio.gz live"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf
index 23ee0a7b..21adb467 100755
--- a/meta-cedartrail/conf/machine/cedartrail.conf
+++ b/meta-cedartrail/conf/machine/cedartrail.conf
@@ -2,17 +2,19 @@
 #@NAME: Cedartrail 
 
 #@DESCRIPTION: Machine configuration for Cedartrail systems
-# i.e. Cedarview processor + Tiger Point Chipset 
+# i.e. Cedarview (N2600, N2800 and D2700) processor +
+# Tiger Point (Intel® NM10 Express) Chipset
 
 include conf/machine/include/tune-atom.inc
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
+                   acpi serial usbgadget alsa"
 
 KERNEL_IMAGETYPE = "bzImage"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "3.0%"
+PREFERRED_VERSION_mesa-dri ?= "7.10.2"
 
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
@@ -24,11 +26,16 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-keyboard \
            xf86-input-evdev \
            xf86-input-synaptics \
-           xf86-video-vesa"
+           mesa-dri \
+           cdv-graphics-drivers " 
 
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+
+SYSLINUX_OPTS = "serial 3 115200"
 SERIAL_CONSOLE = "115200 ttyS3"
+APPEND += "console=ttyS3,115200 console=tty3"
 
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts cedartrail-audio"
 
 IMAGE_FSTYPES ?= "ext3 cpio.gz live"