mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

yocto-bsp: use emgd 1.10 for i386 template

Browse Source 
Make i386 template use emgd 1.10 for denzil, along with associated
changes.

(From meta-yocto rev: 7a93139bcaca7639da0f182356153d2a7539e0c3)

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-07 13:41:20 -05:00
committed by Richard Purdie
parent b8e6eb60b7
commit e352d263f3
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
+4 -3
View File
@@ -23,13 +23,14 @@ 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" }} {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }}
{{ if xserver == "y": }} {{ if xserver == "y" and kernel_choice == "linux-yocto_3.2": }}
{{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} {{ 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_vesa" msg:"VESA xserver support" }}
{{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }}
{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} {{ 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": }} {{ if xserver == "y": }}
XSERVER ?= "${XSERVER_IA32_BASE} \ XSERVER ?= "${XSERVER_IA32_BASE} \
${XSERVER_IA32_EXT} \ ${XSERVER_IA32_EXT} \
@@ -45,7 +46,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
{{ if xserver == "y" and xserver_choice == "xserver_emgd": }} {{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
PREFERRED_VERSION_xserver-xorg ?= "1.9.3" PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
PREFERRED_VERSION_mesa-dri ?= "7.11" PREFERRED_VERSION_mesa-dri ?= "7.11"
PREFERRED_VERSION_emgd-driver-bin ?= "1.8" PREFERRED_VERSION_emgd-driver-bin ?= "1.10"
{{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }}
APPEND += "video=vesafb vga=0x318" APPEND += "video=vesafb vga=0x318"
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc
+4
View File
@@ -6,6 +6,10 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
branch {{=machine}} branch {{=machine}}
{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
include features/emgd/emgd-1.10.scc
git merge emgd-1.10
include {{=machine}}.scc include {{=machine}}.scc
# default policy for standard kernels # default policy for standard kernels
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc
+1 -1
View File
@@ -15,7 +15,7 @@ include features/hpet/hpet.scc
include features/ericsson-3g/f5521gw.scc include features/ericsson-3g/f5521gw.scc
{{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }}
include features/framebuffer/vesafb.scc include cfg/vesafb.scc
include cfg/usb-mass-storage.scc include cfg/usb-mass-storage.scc
include cfg/boot-live.scc include cfg/boot-live.scc