summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-08-07 13:41:20 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-25 14:47:05 +0100
commite352d263f3e263ee6a3e18a5f9e94c7a48133a43 (patch)
tree66585ad8ce95c85bdd3eb798bc1b6211c4ae6d7f
parentb8e6eb60b7a91da18abdf742366159b895c87bb6 (diff)
downloadpoky-e352d263f3e263ee6a3e18a5f9e94c7a48133a43.tar.gz
yocto-bsp: use emgd 1.10 for i386 template
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>
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf7
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc2
3 files changed, 9 insertions, 4 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 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
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": }} 26{{ if xserver == "y" and kernel_choice == "linux-yocto_3.2": }}
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
29{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} 28{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }}
30{{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} 29{{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }}
31{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} 30{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }}
32 31
32{{ if xserver == "y" and kernel_choice != "linux-yocto_3.2": xserver_choice = "xserver_i915" }}
33
33{{ if xserver == "y": }} 34{{ if xserver == "y": }}
34XSERVER ?= "${XSERVER_IA32_BASE} \ 35XSERVER ?= "${XSERVER_IA32_BASE} \
35 ${XSERVER_IA32_EXT} \ 36 ${XSERVER_IA32_EXT} \
@@ -45,7 +46,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
45{{ if xserver == "y" and xserver_choice == "xserver_emgd": }} 46{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
46PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 47PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
47PREFERRED_VERSION_mesa-dri ?= "7.11" 48PREFERRED_VERSION_mesa-dri ?= "7.11"
48PREFERRED_VERSION_emgd-driver-bin ?= "1.8" 49PREFERRED_VERSION_emgd-driver-bin ?= "1.10"
49 50
50{{ 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": }}
51APPEND += "video=vesafb vga=0x318" 52APPEND += "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)
6{{ if need_new_kbranch == "y": }} 6{{ if need_new_kbranch == "y": }}
7branch {{=machine}} 7branch {{=machine}}
8 8
9{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
10include features/emgd/emgd-1.10.scc
11git merge emgd-1.10
12
9include {{=machine}}.scc 13include {{=machine}}.scc
10 14
11# default policy for standard kernels 15# 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
15include features/ericsson-3g/f5521gw.scc 15include features/ericsson-3g/f5521gw.scc
16 16
17{{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} 17{{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }}
18include features/framebuffer/vesafb.scc 18include cfg/vesafb.scc
19 19
20include cfg/usb-mass-storage.scc 20include cfg/usb-mass-storage.scc
21include cfg/boot-live.scc 21include cfg/boot-live.scc