From 759237f721d92fcab6bf1b8d4d5406b5bc9ed17c Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 7 Aug 2012 13:41:20 -0500 Subject: yocto-bsp: use emgd 1.10 for i386 template Make i386 template use emgd 1.10 for denzil, along with associated changes. Signed-off-by: Tom Zanussi --- .../bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | 7 ++++--- .../arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | 4 ++++ .../target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'scripts') 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 100c68cc46..2c109af9b3 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,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" }} -{{ 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:"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": }} XSERVER ?= "${XSERVER_IA32_BASE} \ ${XSERVER_IA32_EXT} \ @@ -45,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.8" +PREFERRED_VERSION_emgd-driver-bin ?= "1.10" {{ 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 2c16efa10b..024af30b04 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 @@ -6,6 +6,10 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch) {{ if need_new_kbranch == "y": }} 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 # default policy for standard kernels diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc index 309f25dc82..15bda3cad0 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc @@ -15,7 +15,7 @@ include features/hpet/hpet.scc include features/ericsson-3g/f5521gw.scc {{ 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/boot-live.scc -- cgit v1.2.3-54-g00ecf