diff options
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 | 13 |
1 files changed, 7 insertions, 6 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 index b06ba12497..2fff9b7e92 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | |||
@@ -23,9 +23,10 @@ require conf/machine/include/tune-i586.inc | |||
23 | {{ if tunefile == "tune_atom": }} | 23 | {{ if tunefile == "tune_atom": }} |
24 | require conf/machine/include/tune-atom.inc | 24 | require conf/machine/include/tune-atom.inc |
25 | {{ if tunefile == "tune_core2": }} | 25 | {{ if tunefile == "tune_core2": }} |
26 | DEFAULTTUNE="core2-32" | ||
26 | require conf/machine/include/tune-core2.inc | 27 | require conf/machine/include/tune-core2.inc |
27 | 28 | ||
28 | require conf/machine/include/ia32-base.inc | 29 | require conf/machine/include/x86-base.inc |
29 | 30 | ||
30 | MACHINE_FEATURES += "wifi efi pcbios" | 31 | MACHINE_FEATURES += "wifi efi pcbios" |
31 | 32 | ||
@@ -46,14 +47,14 @@ MACHINE_FEATURES += "wifi efi pcbios" | |||
46 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.4" and kernel_choice != "linux-yocto_3.10" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} | 47 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.4" and kernel_choice != "linux-yocto_3.10" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} |
47 | 48 | ||
48 | {{ if xserver == "y": }} | 49 | {{ if xserver == "y": }} |
49 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 50 | XSERVER ?= "${XSERVER_X86_BASE} \ |
50 | ${XSERVER_IA32_EXT} \ | 51 | ${XSERVER_X86_EXT} \ |
51 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | 52 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} |
52 | ${XSERVER_IA32_VESA} \ | 53 | ${XSERVER_X86_VESA} \ |
53 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} | 54 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} |
54 | ${XSERVER_IA32_I915} \ | 55 | ${XSERVER_X86_I915} \ |
55 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} | 56 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} |
56 | ${XSERVER_IA32_I965} \ | 57 | ${XSERVER_X86_I965} \ |
57 | {{ if xserver == "y": }} | 58 | {{ if xserver == "y": }} |
58 | " | 59 | " |
59 | 60 | ||