yocto-bsp: add 3.10/remove 3.8 kernel from templates

For Yocto 1.5, 3.10 is the preferred kernel and 3.8 is obsolete.

This also removes any mention of emgd from the templates - we want to
discourage users from using it - it will be obsolete soon in any case.

Fixes [YOCTO #5107]

(From meta-yocto rev: 4dd4bf6ac2dcc7652ec8f807df02298546bdb41b)

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

5 files changed, 1 insertions, 98 deletions

diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/{{ if xserver == "y": }} xorg.conf b/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/{{ if xserver == "y": }} xorg.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/{{ if xserver == "y": }} xorg.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/{{ if xserver_choice == "xserver_emgd": }} xorg.conf b/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/{{ if xserver_choice == "xserver_emgd": }} xorg.conf
deleted file mode 100644
index 3347437..0000000
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/{{ if xserver_choice == "xserver_emgd": }} xorg.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## X Config options generated from CED
-## x11 conf skeleton
-## DriverVer=
-##
-
-Section "Screen"
-    Identifier    "Screen0"
-    Device        "IntelEMGD-0"
-    Monitor       "Monitor0"
-    SubSection    "Display"
-    EndSubSection
-EndSection
-
-# 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"      "24000"
-    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 0       "Screen0" 0 0
-   # InputDevice    "Mouse0" "CorePointer"
-   # InputDevice    "Keyboard0" "CoreKeyboard"
-   # InputDevice    "DevInputMice" "SendCoreEvents"
-EndSection
-
-Section "ServerFlags"
-    Option        "DontZap"  "0"
-EndSection
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/{{ if xserver_choice == "xserver_i915": }} xorg.conf b/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/{{ if xserver_choice == "xserver_i915": }} xorg.conf
deleted file mode 100644
index b658f40..0000000
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/{{ if xserver_choice == "xserver_i915": }} xorg.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-Section "Device"
-    Identifier	"Intel Graphics Driver"
-    Driver	"intel"
-EndSection
-
-Section "Monitor"
-    Identifier    "Generic Monitor"
-    Option        "DPMS"
-EndSection
-
-Section "Screen"
-    Identifier    "Default Screen"
-    Device	  "Intel Graphics Driver"
-    Monitor       "Generic Monitor"
-    DefaultDepth  24
-EndSection
-
-Section "ServerLayout"
-    Identifier     "Default Layout"
-    Screen         "Default Screen"
-EndSection
-
-Section "ServerFlags"
-    Option        "DontZap"  "0"
-EndSection
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/{{ if xserver_choice == "xserver_vesa": }} xorg.conf b/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/{{ if xserver_choice == "xserver_vesa": }} xorg.conf
deleted file mode 100644
index ae58e2b..0000000
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/{{ if xserver_choice == "xserver_vesa": }} xorg.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-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"
-EndSection
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
index 155f67b..72d991c 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"