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 | 16 |
1 files changed, 13 insertions, 3 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 1da230629a..86d6a53331 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 | |||
@@ -3,8 +3,13 @@ | |||
3 | 3 | ||
4 | #@DESCRIPTION: Machine configuration for {{=machine}} systems | 4 | #@DESCRIPTION: Machine configuration for {{=machine}} systems |
5 | 5 | ||
6 | {{ preferred_kernel = kernel_choice.split('_')[0] }} | 6 | {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} |
7 | {{ preferred_kernel_version = kernel_choice.split('_')[1] }} | 7 | {{ if kernel_choice == "custom": }} |
8 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | ||
9 | |||
10 | {{ if kernel_choice != "custom": preferred_kernel = kernel_choice.split('_')[0] }} | ||
11 | {{ if kernel_choice != "custom": preferred_kernel_version = kernel_choice.split('_')[1] }} | ||
12 | {{ if kernel_choice != "custom": }} | ||
8 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | 13 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" |
9 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" | 14 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" |
10 | 15 | ||
@@ -31,7 +36,12 @@ require conf/machine/include/meta-intel.inc | |||
31 | {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} | 36 | {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} |
32 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 37 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
33 | 38 | ||
34 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.4": xserver_choice = "xserver_i915" }} | 39 | {{ if xserver == "y" and kernel_choice == "custom": }} |
40 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} | ||
41 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | ||
42 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | ||
43 | |||
44 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.4" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} | ||
35 | 45 | ||
36 | {{ if xserver == "y": }} | 46 | {{ if xserver == "y": }} |
37 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 47 | XSERVER ?= "${XSERVER_IA32_BASE} \ |