diff options
Diffstat (limited to 'scripts/lib/bsp')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | 6 | ||||
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | 4 |
2 files changed, 5 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 2c109af9b3..2a07889a5f 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,13 +23,13 @@ require conf/machine/include/ia32-base.inc | |||
23 | 23 | ||
24 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} | 24 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} |
25 | 25 | ||
26 | {{ if xserver == "y" and kernel_choice == "linux-yocto_3.2": }} | 26 | {{ if xserver == "y" and kernel_choice == "linux-yocto_3.4": }} |
27 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} | 27 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} |
28 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | 28 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} |
29 | {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} | 29 | {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} |
30 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 30 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
31 | 31 | ||
32 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.2": xserver_choice = "xserver_i915" }} | 32 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.4": xserver_choice = "xserver_i915" }} |
33 | 33 | ||
34 | {{ if xserver == "y": }} | 34 | {{ if xserver == "y": }} |
35 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 35 | XSERVER ?= "${XSERVER_IA32_BASE} \ |
@@ -46,7 +46,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ | |||
46 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} | 46 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} |
47 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | 47 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" |
48 | PREFERRED_VERSION_mesa-dri ?= "7.11" | 48 | PREFERRED_VERSION_mesa-dri ?= "7.11" |
49 | PREFERRED_VERSION_emgd-driver-bin ?= "1.10" | 49 | PREFERRED_VERSION_emgd-driver-bin ?= "1.14" |
50 | 50 | ||
51 | {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} | 51 | {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} |
52 | APPEND += "video=vesafb vga=0x318" | 52 | APPEND += "video=vesafb vga=0x318" |
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc index 024af30b04..c6f42db4cf 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | |||
@@ -7,8 +7,8 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch) | |||
7 | branch {{=machine}} | 7 | branch {{=machine}} |
8 | 8 | ||
9 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} | 9 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} |
10 | include features/emgd/emgd-1.10.scc | 10 | include features/emgd/emgd-1.14.scc |
11 | git merge emgd-1.10 | 11 | git merge emgd-1.14 |
12 | 12 | ||
13 | include {{=machine}}.scc | 13 | include {{=machine}}.scc |
14 | 14 | ||