diff options
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 | 15 |
1 files changed, 8 insertions, 7 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 2bf2226f18..6685d07ab2 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 | |||
@@ -14,8 +14,9 @@ PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | |||
14 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | 14 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" |
15 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" | 15 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" |
16 | 16 | ||
17 | require conf/machine/include/tune-x86_64.inc | 17 | DEFAULTTUNE ?= "core2-64" |
18 | require conf/machine/include/ia32-base.inc | 18 | require conf/machine/include/tune-core2.inc |
19 | require conf/machine/include/x86-base.inc | ||
19 | 20 | ||
20 | MACHINE_FEATURES += "wifi efi pcbios" | 21 | MACHINE_FEATURES += "wifi efi pcbios" |
21 | 22 | ||
@@ -28,14 +29,14 @@ MACHINE_FEATURES += "wifi efi pcbios" | |||
28 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 29 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
29 | {{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} | 30 | {{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} |
30 | {{ if xserver == "y": }} | 31 | {{ if xserver == "y": }} |
31 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 32 | XSERVER ?= "${XSERVER_X86_BASE} \ |
32 | ${XSERVER_IA32_EXT} \ | 33 | ${XSERVER_X86_EXT} \ |
33 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | 34 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} |
34 | ${XSERVER_IA32_VESA} \ | 35 | ${XSERVER_X86_VESA} \ |
35 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} | 36 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} |
36 | ${XSERVER_IA32_I915} \ | 37 | ${XSERVER_X86_I915} \ |
37 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} | 38 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} |
38 | ${XSERVER_IA32_I965} \ | 39 | ${XSERVER_X86_I965} \ |
39 | {{ if xserver == "y": }} | 40 | {{ if xserver == "y": }} |
40 | " | 41 | " |
41 | 42 | ||