2 files changed, 61 insertions, 13 deletions
diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
new file mode 100644
index 00000000..da4fc3c6
--- /dev/null
+++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
@@ -0,0 +1,26 @@
+Section "Device"
+    Identifier  "Generic VESA"
+    Driver      "vesa"
+EndSection
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+EndSection
+Section "Screen"
+    Identifier    "Default Screen"
+    Device        "Generic VESA"
+    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-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"
+## X Config options generated from CED
-    Driver      "vesa"
+## x11 conf skeleton
-EndSection
+## DriverVer=
+##
-Section "Monitor"
+Section "Screen"
-    Identifier    "Generic Monitor"
+    Identifier    "Screen0"
-    Option        "DPMS"
+    Device        "IntelEMGD-0"
+    Monitor       "Monitor0"
+    SubSection    "Display"
+    EndSubSection
 EndSection
-Section "Screen"
+# Primary (First/only) display
-    Identifier    "Default Screen"
+Section "Device"
-    Device        "Generic VESA"
+    Identifier "IntelEMGD-0"
-    Monitor       "Generic Monitor"
+    Driver     "emgd"
-    DefaultDepth  24
+    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"

diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf new file mode 100644 index 00000000..da4fc3c6 --- /dev/null +++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
@@ -0,0 +1,26 @@
		1	Section "Device"
		2	Identifier "Generic VESA"
		3	Driver "vesa"
		4	EndSection
		5
		6	Section "Monitor"
		7	Identifier "Generic Monitor"
		8	Option "DPMS"
		9	EndSection
		10
		11	Section "Screen"
		12	Identifier "Default Screen"
		13	Device "Generic VESA"
		14	Monitor "Generic Monitor"
		15	DefaultDepth 24
		16	EndSection
		17
		18	Section "ServerLayout"
		19	Identifier "Default Layout"
		20	Screen "Default Screen"
		21	EndSection
		22
		23	Section "ServerFlags"
		24	Option "DontZap" "0"
		25	Option "AutoAddDevices" "False"
		26	EndSection


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 @@
1	Section "Device"	1	##
2	Identifier "Generic VESA"	2	## X Config options generated from CED
3	Driver "vesa"	3	## x11 conf skeleton
4	EndSection	4	## DriverVer=
		5	##
5		6
6	Section "Monitor"	7	Section "Screen"
7	Identifier "Generic Monitor"	8	Identifier "Screen0"
8	Option "DPMS"	9	Device "IntelEMGD-0"
		10	Monitor "Monitor0"
		11	SubSection "Display"
		12	EndSubSection
9	EndSection	13	EndSection
10		14
11	Section "Screen"	15	# Primary (First/only) display
12	Identifier "Default Screen"	16	Section "Device"
13	Device "Generic VESA"	17	Identifier "IntelEMGD-0"
14	Monitor "Generic Monitor"	18	Driver "emgd"
15	DefaultDepth 24	19	VendorName "Intel(R) DEG"
		20	BoardName "Embedded Graphics"
		21	BusID "0:2:0"
		22	Screen 0
		23	Option "PcfVersion" "1792"
		24	Option "ConfigId" "1"
		25	Option "ALL/1/name" "e6xx"
		26	Option "ALL/1/General/PortOrder" "40000"
		27	Option "ALL/1/General/DisplayConfig" "1"
		28	Option "ALL/1/General/DisplayDetect" "1"
		29	Option "ALL/1/General/TuningWA" "1"
		30	Option "ALL/1/Port/4/General/name" "lvds"
		31	Option "ALL/1/Port/4/General/EdidAvail" "3"
		32	Option "ALL/1/Port/4/General/EdidNotAvail" "1"
		33	Option "ALL/1/Port/4/General/Rotation" "0"
		34	Option "ALL/1/Port/4/General/Edid" "0"
16	EndSection	35	EndSection
17		36
18	Section "ServerLayout"	37	Section "ServerLayout"
19	Identifier "Default Layout"	38	Identifier "Default Layout"
20	Screen "Default Screen"	39	Screen 0 "Screen0" 0 0
		40	# InputDevice "Mouse0" "CorePointer"
		41	# InputDevice "Keyboard0" "CoreKeyboard"
		42	# InputDevice "DevInputMice" "SendCoreEvents"
21	EndSection	43	EndSection
22		44
23	Section "ServerFlags"	45	Section "ServerFlags"