4 files changed, 57 insertions, 0 deletions

diff --git a/meta-emenlow/conf/machine/emenlow-noemgd.conf b/meta-emenlow/conf/machine/emenlow-noemgd.conf
new file mode 100644
index 00000000..9a995c12
--- /dev/null
+++ b/meta-emenlow/conf/machine/emenlow-noemgd.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: emenlow-noemgd
+
+#@WEBTITLE: Intel Atom Z5xx Processor With Intel US15W Controller Hub (eMenlow) with open source graphics
+
+#@DESCRIPTION: Machine configuration for eMenlow based systems, like the Webs-2120 box, without the Intel-proprietary graphics bits
+
+PREFERRED_VERSION_linux-yocto ?= "3.4%"
+
+require conf/machine/include/tune-atom.inc
+require conf/machine/include/ia32-base.inc
+
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+           ${XSERVER_IA32_MODESETTING} \
+           "
diff --git a/meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow-noemgd/machconfig b/meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow-noemgd/machconfig
new file mode 100644
index 00000000..ffce0122
--- /dev/null
+++ b/meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow-noemgd/machconfig
@@ -0,0 +1,3 @@
+# Assume a USB mouse and keyboard are connected
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf
new file mode 100644
index 00000000..aa6f32b4
--- /dev/null
+++ b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf
@@ -0,0 +1,27 @@
+Section "Device"
+    Identifier    "gma500"
+    Driver        "modesetting"
+    Option        "SWCursor"       "ON"
+EndSection
+
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+EndSection
+
+Section "Screen"
+    Identifier    "Default Screen"
+    Device        "gma500"
+    Monitor       "Generic Monitor"
+    DefaultDepth  24
+EndSection
+
+Section "ServerLayout"
+    Identifier     "Default Layout"
+    Screen         "Default Screen"
+EndSection
+
+Section "ServerFlags"
+    Option        "DontZap"  "0"
+    Option        "AutoAddDevices"  "False"
+EndSection
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend
index d0306bc7..d3700240 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -5,5 +5,16 @@ KMACHINE_emenlow  = "emenlow"
 KBRANCH_emenlow  = "standard/emenlow"
 KERNEL_FEATURES_emenlow_append = " features/drm-emgd cfg/vesafb"
 
+COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
+KMACHINE_emenlow-noemgd  = "emenlow"
+KBRANCH_emenlow-noemgd  = "standard/emenlow"
+KERNEL_FEATURES_emenlow-noemgd_append = " features/drm-gma500/drm-gma600"
+
 SRCREV_machine_pn-linux-yocto_emenlow ?= "${AUTOREV}"
 SRCREV_meta_pn-linux-yocto_emenlow ?= "${AUTOREV}"
+SRCREV_emgd_pn-linux-yocto_emenlow ?= "${AUTOREV}"
+
+SRCREV_machine_pn-linux-yocto_emenlow-noemgd ?= "${AUTOREV}"
+SRCREV_meta_pn-linux-yocto_emenlow-noemgd ?= "${AUTOREV}"
+
+SRC_URI_emenlow = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.14;name=machine,meta,emgd"