diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-12-03 11:15:50 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-05 18:00:21 +0000 |
commit | 0cc9a12ff855ad472c082efc429043208112b888 (patch) | |
tree | c8527e26f2b413be6aa546d4e494825cdc282e47 /scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf | |
parent | 4fa0f0c8bd41763d5b4c80e05373754a02976afc (diff) | |
download | poky-0cc9a12ff855ad472c082efc429043208112b888.tar.gz |
yocto-bsp: Update templates to 3.17 kernel
Add 3.17 kernel support.
(From meta-yocto rev: cdebafc6f87ae635769cf93787c97caa8e58e13e)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf | 10 |
1 files changed, 9 insertions, 1 deletions
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 0780af90da..230c2fcfc0 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 | |||
@@ -36,6 +36,8 @@ MACHINE_FEATURES += "wifi efi pcbios" | |||
36 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | 36 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} |
37 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 37 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
38 | {{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} | 38 | {{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} |
39 | {{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} | ||
40 | {{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} | ||
39 | {{ if xserver == "y": }} | 41 | {{ if xserver == "y": }} |
40 | XSERVER ?= "${XSERVER_X86_BASE} \ | 42 | XSERVER ?= "${XSERVER_X86_BASE} \ |
41 | ${XSERVER_X86_EXT} \ | 43 | ${XSERVER_X86_EXT} \ |
@@ -45,12 +47,18 @@ XSERVER ?= "${XSERVER_X86_BASE} \ | |||
45 | ${XSERVER_X86_I915} \ | 47 | ${XSERVER_X86_I915} \ |
46 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} | 48 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} |
47 | ${XSERVER_X86_I965} \ | 49 | ${XSERVER_X86_I965} \ |
50 | {{ if xserver == "y" and xserver_choice == "xserver_fbdev": }} | ||
51 | ${XSERVER_X86_FBDEV} \ | ||
52 | {{ if xserver == "y" and xserver_choice == "xserver_modesetting": }} | ||
53 | ${XSERVER_X86_MODESETTING} \ | ||
48 | {{ if xserver == "y": }} | 54 | {{ if xserver == "y": }} |
49 | " | 55 | " |
50 | 56 | ||
51 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d" | 57 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d eee-acpi-scripts" |
52 | 58 | ||
53 | EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" | 59 | EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" |
54 | 60 | ||
61 | GLIBC_ADDONS = "nptl" | ||
62 | |||
55 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | 63 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} |
56 | APPEND += "video=vesafb vga=0x318" | 64 | APPEND += "video=vesafb vga=0x318" |