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 --- .../target/arch/x86_64/conf/machine/{{=machine}}.conf | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf') diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf index f20d161609..2bf2226f18 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf @@ -17,6 +17,8 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" require conf/machine/include/tune-x86_64.inc require conf/machine/include/ia32-base.inc +MACHINE_FEATURES += "wifi efi pcbios" + {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} {{ if xserver == "y": }} @@ -24,6 +26,7 @@ require conf/machine/include/ia32-base.inc {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} +{{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} {{ if xserver == "y": }} XSERVER ?= "${XSERVER_IA32_BASE} \ ${XSERVER_IA32_EXT} \ @@ -31,8 +34,16 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ ${XSERVER_IA32_VESA} \ {{ if xserver == "y" and xserver_choice == "xserver_i915": }} ${XSERVER_IA32_I915} \ -{{ if xserver == "y" and xserver == "y": }} +{{ if xserver == "y" and xserver_choice == "xserver_i965": }} + ${XSERVER_IA32_I965} \ +{{ if xserver == "y": }} " +MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d" + +GLIBC_ADDONS = "nptl" + +EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" + {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} APPEND += "video=vesafb vga=0x318" -- cgit v1.2.3-54-g00ecf