sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Tom Zanussi 2012-08-08 09:33:32 -05:00 committed by Richard Purdie
parent d8b00e744b
commit 4bb2e2f6b3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
View File

@ -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"

4
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc
View File

@ -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