meta-fri2: add EMGD 1.8 capabilities to fri2

This patch essentially adds a new EMGD-capable 'fri2' machine to
meta-fri2.

The current version with vesa graphics will become fri2-noemgd; fri2
will become the version with EMGD graphics.  This patch does the
fri2->fri2-noemgd renaming and adds the new files for fri2, and
updates the necessary .bbappends to support both fri2 and fri2-noemgd.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>

1 files changed, 35 insertions, 13 deletions

diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
index da4fc3c6..fce58f89 100644
--- a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
+++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
@@ -1,23 +1,45 @@
-Section "Device"
-    Identifier  "Generic VESA"
-    Driver      "vesa"
-EndSection
+##
+## X Config options generated from CED
+## x11 conf skeleton
+## DriverVer=
+##
 
-Section "Monitor"
-    Identifier    "Generic Monitor"
-    Option        "DPMS"
+Section "Screen"
+    Identifier    "Screen0"
+    Device        "IntelEMGD-0"
+    Monitor       "Monitor0"
+    SubSection    "Display"
+    EndSubSection
 EndSection
 
-Section "Screen"
-    Identifier    "Default Screen"
-    Device        "Generic VESA"
-    Monitor       "Generic Monitor"
-    DefaultDepth  24
+# Primary (First/only) display
+Section "Device"
+    Identifier "IntelEMGD-0"
+    Driver     "emgd"
+    VendorName "Intel(R) DEG"
+    BoardName  "Embedded Graphics"
+    BusID      "0:2:0"
+    Screen      0
+    Option     "PcfVersion"            "1792"
+    Option     "ConfigId"              "1"
+    Option     "ALL/1/name"                   "e6xx"
+    Option     "ALL/1/General/PortOrder"      "40000"
+    Option     "ALL/1/General/DisplayConfig"  "1"
+    Option     "ALL/1/General/DisplayDetect"  "1"
+    Option     "ALL/1/General/TuningWA" "1"
+    Option     "ALL/1/Port/4/General/name"           "lvds"
+    Option     "ALL/1/Port/4/General/EdidAvail"      "3"
+    Option     "ALL/1/Port/4/General/EdidNotAvail"   "1"
+    Option     "ALL/1/Port/4/General/Rotation"       "0"
+    Option     "ALL/1/Port/4/General/Edid"           "0"
 EndSection
 
 Section "ServerLayout"
     Identifier     "Default Layout"
-    Screen         "Default Screen"
+    Screen 0       "Screen0" 0 0
+   # InputDevice    "Mouse0" "CorePointer"
+   # InputDevice    "Keyboard0" "CoreKeyboard"
+   # InputDevice    "DevInputMice" "SendCoreEvents"
 EndSection
 
 Section "ServerFlags"