From 0fc8317c6385eb1ed69ca4522ee6424c456dbb92 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 23 Sep 2013 08:42:51 -0500 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc') 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 include features/serial/8250.scc {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} include cfg/vesafb.scc -{{ if xserver == "y" and xserver_choice == "xserver_i915": }} +{{ if xserver == "y" and xserver_choice == "xserver_i915" or xserver_choice == "xserver_i965": }} include features/i915/i915.scc + include cfg/usb-mass-storage.scc include features/power/intel.scc -- cgit v1.2.3-54-g00ecf