diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-12-16 18:41:03 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-18 10:08:56 +0000 |
commit | 37a6affc485e729ad4bcb1f1af278f56a0dbbd58 (patch) | |
tree | 6e0f55ec59eb4ab9908a4579550a33fcf61c1b22 /scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | |
parent | cac54469898e11ff68f18acef24988446f5cb7cf (diff) | |
download | poky-37a6affc485e729ad4bcb1f1af278f56a0dbbd58.tar.gz |
yocto-bsp: Get rid of 'strange' filenames in x86 templates
For the x86 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: 9fa30ad9cf1291a37d365515ec8d969fb4fd4aef)
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/i386/conf/machine/{{=machine}}.conf')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf deleted file mode 100644 index 660eb6d7c0..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf +++ /dev/null | |||
@@ -1,76 +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_i586" msg:"i586 tuning optimizations" }} | ||
19 | {{ input type:"choice" val:"tune_atom" msg:"Atom tuning optimizations" }} | ||
20 | {{ input type:"choice" val:"tune_core2" msg:"Core2 tuning optimizations" }} | ||
21 | {{ if tunefile == "tune_i586": }} | ||
22 | require conf/machine/include/tune-i586.inc | ||
23 | {{ if tunefile == "tune_atom": }} | ||
24 | require conf/machine/include/tune-atom.inc | ||
25 | {{ if tunefile == "tune_core2": }} | ||
26 | DEFAULTTUNE="core2-32" | ||
27 | require conf/machine/include/tune-core2.inc | ||
28 | |||
29 | require conf/machine/include/x86-base.inc | ||
30 | |||
31 | MACHINE_FEATURES += "wifi efi pcbios" | ||
32 | |||
33 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} | ||
34 | |||
35 | {{ if xserver == "y" and (kernel_choice == "linux-yocto_3.17" or kernel_choice == "linux-yocto_3.14" or kernel_choice == "linux-yocto_3.10"): }} | ||
36 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} | ||
37 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | ||
38 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | ||
39 | {{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} | ||
40 | {{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} | ||
41 | {{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} | ||
42 | |||
43 | {{ if xserver == "y" and kernel_choice == "custom": }} | ||
44 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} | ||
45 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | ||
46 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | ||
47 | {{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} | ||
48 | {{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} | ||
49 | {{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} | ||
50 | |||
51 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.17" and kernel_choice != "linux-yocto_3.14" and kernel_choice != "linux-yocto_3.10" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} | ||
52 | |||
53 | {{ if xserver == "y": }} | ||
54 | XSERVER ?= "${XSERVER_X86_BASE} \ | ||
55 | ${XSERVER_X86_EXT} \ | ||
56 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | ||
57 | ${XSERVER_X86_VESA} \ | ||
58 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} | ||
59 | ${XSERVER_X86_I915} \ | ||
60 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} | ||
61 | ${XSERVER_X86_I965} \ | ||
62 | {{ if xserver == "y" and xserver_choice == "xserver_fbdev": }} | ||
63 | ${XSERVER_X86_FBDEV} \ | ||
64 | {{ if xserver == "y" and xserver_choice == "xserver_modesetting": }} | ||
65 | ${XSERVER_X86_MODESETTING} \ | ||
66 | {{ if xserver == "y": }} | ||
67 | " | ||
68 | |||
69 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d eee-acpi-scripts" | ||
70 | |||
71 | EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" | ||
72 | |||
73 | GLIBC_ADDONS = "nptl" | ||
74 | |||
75 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | ||
76 | APPEND += "video=vesafb vga=0x318" | ||