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 | 20 |
1 files changed, 15 insertions, 5 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 0df4dc2035..660eb6d7c0 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 | |||
@@ -32,19 +32,23 @@ MACHINE_FEATURES += "wifi efi pcbios" | |||
32 | 32 | ||
33 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} | 33 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} |
34 | 34 | ||
35 | {{ if xserver == "y" and (kernel_choice == "linux-yocto_3.14" or kernel_choice == "linux-yocto_3.10"): }} | 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_i915" }} | 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" }} | 37 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} |
38 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 38 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
39 | {{ input type:"choice" val:"xserver_i965" msg:"i965 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" }} | ||
40 | 42 | ||
41 | {{ if xserver == "y" and kernel_choice == "custom": }} | 43 | {{ if xserver == "y" and kernel_choice == "custom": }} |
42 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} | 44 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} |
43 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | 45 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} |
44 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 46 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
45 | {{ input type:"choice" val:"xserver_i965" msg:"i965 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" }} | ||
46 | 50 | ||
47 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.14" and kernel_choice != "linux-yocto_3.10" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} | 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" }} |
48 | 52 | ||
49 | {{ if xserver == "y": }} | 53 | {{ if xserver == "y": }} |
50 | XSERVER ?= "${XSERVER_X86_BASE} \ | 54 | XSERVER ?= "${XSERVER_X86_BASE} \ |
@@ -55,12 +59,18 @@ XSERVER ?= "${XSERVER_X86_BASE} \ | |||
55 | ${XSERVER_X86_I915} \ | 59 | ${XSERVER_X86_I915} \ |
56 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} | 60 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} |
57 | ${XSERVER_X86_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} \ | ||
58 | {{ if xserver == "y": }} | 66 | {{ if xserver == "y": }} |
59 | " | 67 | " |
60 | 68 | ||
61 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d" | 69 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d eee-acpi-scripts" |
62 | 70 | ||
63 | EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" | 71 | EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" |
64 | 72 | ||
73 | GLIBC_ADDONS = "nptl" | ||
74 | |||
65 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | 75 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} |
66 | APPEND += "video=vesafb vga=0x318" | 76 | APPEND += "video=vesafb vga=0x318" |