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 | 29 |
1 files changed, 15 insertions, 14 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 78a753c3df..b06ba12497 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 | |||
@@ -26,41 +26,42 @@ require conf/machine/include/tune-atom.inc | |||
26 | require conf/machine/include/tune-core2.inc | 26 | require conf/machine/include/tune-core2.inc |
27 | 27 | ||
28 | require conf/machine/include/ia32-base.inc | 28 | require conf/machine/include/ia32-base.inc |
29 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} | 29 | |
30 | require conf/machine/include/meta-intel.inc | 30 | MACHINE_FEATURES += "wifi efi pcbios" |
31 | 31 | ||
32 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} | 32 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} |
33 | 33 | ||
34 | {{ if xserver == "y" and (kernel_choice == "linux-yocto_3.4" or kernel_choice == "linux-yocto_3.8"): }} | 34 | {{ if xserver == "y" and (kernel_choice == "linux-yocto_3.4" or kernel_choice == "linux-yocto_3.10"): }} |
35 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} | 35 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} |
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_emgd" msg:"EMGD xserver support (proprietary)" }} | ||
38 | {{ 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" }} | ||
39 | 39 | ||
40 | {{ if xserver == "y" and kernel_choice == "custom": }} | 40 | {{ if xserver == "y" and kernel_choice == "custom": }} |
41 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} | 41 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} |
42 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | 42 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} |
43 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 43 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
44 | {{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} | ||
44 | 45 | ||
45 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.4" and kernel_choice != "linux-yocto_3.8" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} | 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" }} |
46 | 47 | ||
47 | {{ if xserver == "y": }} | 48 | {{ if xserver == "y": }} |
48 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 49 | XSERVER ?= "${XSERVER_IA32_BASE} \ |
49 | ${XSERVER_IA32_EXT} \ | 50 | ${XSERVER_IA32_EXT} \ |
50 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | 51 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} |
51 | ${XSERVER_IA32_VESA} \ | 52 | ${XSERVER_IA32_VESA} \ |
52 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} | ||
53 | ${XSERVER_IA32_EMGD} \ | ||
54 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} | 53 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} |
55 | ${XSERVER_IA32_I915} \ | 54 | ${XSERVER_IA32_I915} \ |
55 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} | ||
56 | ${XSERVER_IA32_I965} \ | ||
56 | {{ if xserver == "y": }} | 57 | {{ if xserver == "y": }} |
57 | " | 58 | " |
58 | 59 | ||
59 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} | 60 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d" |
60 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | 61 | |
61 | PREFERRED_VERSION_mesa ?= "9.0.2" | 62 | GLIBC_ADDONS = "nptl" |
62 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" | ||
63 | PREFERRED_VERSION_emgd-driver-bin ?= "1.16" | ||
64 | 63 | ||
65 | {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} | 64 | EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" |
66 | APPEND += "video=vesafb vga=0x318 vmalloc=256MB" | 65 | |
66 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | ||
67 | APPEND += "video=vesafb vga=0x318" | ||