diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-09-23 08:42:51 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-24 12:01:47 +0100 |
commit | 0fc8317c6385eb1ed69ca4522ee6424c456dbb92 (patch) | |
tree | 8b878687d9309556c4476ccb17467f52faa36d62 /scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc | |
parent | bf6b0d95db3863a2cfbccb154c0c7ad5b3bbf0b0 (diff) | |
download | poky-0fc8317c6385eb1ed69ca4522ee6424c456dbb92.tar.gz |
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>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc index 61899319da..db45140381 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc | |||
@@ -3,8 +3,9 @@ kconf hardware {{=machine}}.cfg | |||
3 | include features/serial/8250.scc | 3 | include features/serial/8250.scc |
4 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | 4 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} |
5 | include cfg/vesafb.scc | 5 | include cfg/vesafb.scc |
6 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} | 6 | {{ if xserver == "y" and xserver_choice == "xserver_i915" or xserver_choice == "xserver_i965": }} |
7 | include features/i915/i915.scc | 7 | include features/i915/i915.scc |
8 | |||
8 | include cfg/usb-mass-storage.scc | 9 | include cfg/usb-mass-storage.scc |
9 | include features/power/intel.scc | 10 | include features/power/intel.scc |
10 | 11 | ||