diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-08-08 09:33:32 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-25 14:47:06 +0100 |
commit | 4bb2e2f6b364ad05791810c5ecc8783c2cb777ce (patch) | |
tree | af6d217047b1ac8275274ef9793ee531d026f345 /scripts | |
parent | d8b00e744b7b1d5a66930f91a4bce1945434ee82 (diff) | |
download | ast2050-yocto-poky-4bb2e2f6b364ad05791810c5ecc8783c2cb777ce.zip ast2050-yocto-poky-4bb2e2f6b364ad05791810c5ecc8783c2cb777ce.tar.gz |
yocto-bsp: use emgd 1.14 for i386 template
Make i386 template use emgd 1.14, along with associated changes.
(From meta-yocto rev: 69f49f7e8370112164b70b9a5ae6f3c0e1ce0bfa)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-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 2c109af..2a07889 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 {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} -{{ if xserver == "y" and kernel_choice == "linux-yocto_3.2": }} +{{ if xserver == "y" and kernel_choice == "linux-yocto_3.4": }} {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} -{{ if xserver == "y" and kernel_choice != "linux-yocto_3.2": xserver_choice = "xserver_i915" }} +{{ if xserver == "y" and kernel_choice != "linux-yocto_3.4": xserver_choice = "xserver_i915" }} {{ if xserver == "y": }} XSERVER ?= "${XSERVER_IA32_BASE} \ @@ -46,7 +46,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} PREFERRED_VERSION_xserver-xorg ?= "1.9.3" PREFERRED_VERSION_mesa-dri ?= "7.11" -PREFERRED_VERSION_emgd-driver-bin ?= "1.10" +PREFERRED_VERSION_emgd-driver-bin ?= "1.14" {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} 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 024af30..c6f42db 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) branch {{=machine}} {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} -include features/emgd/emgd-1.10.scc -git merge emgd-1.10 +include features/emgd/emgd-1.14.scc +git merge emgd-1.14 include {{=machine}}.scc |