diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-12-16 18:41:07 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-18 10:09:01 +0000 |
commit | fb760054d4fa39d1f266d7d6b8acd5fa9a66f8cb (patch) | |
tree | 0fae7a3fec367b90207132a6350506d2ac2aa07a /scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf | |
parent | 82e8b73d7898f856b5a2033d0c8c7afec129ef54 (diff) | |
download | poky-fb760054d4fa39d1f266d7d6b8acd5fa9a66f8cb.tar.gz |
yocto-bsp: Get rid of 'strange' filenames in x86_64 templates
For the x86_64 templates, give all the 'strange' yocto-bsp template
filenames 'normal' names, adding new yocto-bsp-filename and
yocto-bsp-dirname tags for the new filename processing pass where
needed.
(From meta-yocto rev: d478b11db66795040009e9b7d7751300d4385018)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.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 | 64 |
1 files changed, 0 insertions, 64 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 deleted file mode 100644 index 230c2fcfc0..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: {{=machine}} | ||
3 | |||
4 | #@DESCRIPTION: Machine configuration for {{=machine}} systems | ||
5 | |||
6 | {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} | ||
7 | {{ if kernel_choice == "linux-yocto-dev": preferred_kernel = "linux-yocto-dev" }} | ||
8 | {{ if kernel_choice == "custom" or kernel_choice == "linux-yocto-dev" : }} | ||
9 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | ||
10 | |||
11 | {{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": preferred_kernel = kernel_choice.split('_')[0] }} | ||
12 | {{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": preferred_kernel_version = kernel_choice.split('_')[1] }} | ||
13 | {{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": }} | ||
14 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | ||
15 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" | ||
16 | |||
17 | {{ input type:"choicelist" name:"tunefile" prio:"40" msg:"Which machine tuning would you like to use?" default:"tune_core2" }} | ||
18 | {{ input type:"choice" val:"tune_core2" msg:"Core2 tuning optimizations" }} | ||
19 | {{ input type:"choice" val:"tune_corei7" msg:"Corei7 tuning optimizations" }} | ||
20 | {{ if tunefile == "tune_core2": }} | ||
21 | DEFAULTTUNE ?= "core2-64" | ||
22 | require conf/machine/include/tune-core2.inc | ||
23 | {{ if tunefile == "tune_corei7": }} | ||
24 | DEFAULTTUNE ?= "corei7-64" | ||
25 | require conf/machine/include/tune-corei7.inc | ||
26 | |||
27 | require conf/machine/include/x86-base.inc | ||
28 | |||
29 | MACHINE_FEATURES += "wifi efi pcbios" | ||
30 | |||
31 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} | ||
32 | |||
33 | {{ if xserver == "y": }} | ||
34 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} | ||
35 | |||
36 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | ||
37 | {{ input type:"choice" val:"xserver_i915" msg:"i915 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" }} | ||
41 | {{ if xserver == "y": }} | ||
42 | XSERVER ?= "${XSERVER_X86_BASE} \ | ||
43 | ${XSERVER_X86_EXT} \ | ||
44 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | ||
45 | ${XSERVER_X86_VESA} \ | ||
46 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} | ||
47 | ${XSERVER_X86_I915} \ | ||
48 | {{ if xserver == "y" and xserver_choice == "xserver_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} \ | ||
54 | {{ if xserver == "y": }} | ||
55 | " | ||
56 | |||
57 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d eee-acpi-scripts" | ||
58 | |||
59 | EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" | ||
60 | |||
61 | GLIBC_ADDONS = "nptl" | ||
62 | |||
63 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | ||
64 | APPEND += "video=vesafb vga=0x318" | ||