From e352d263f3e263ee6a3e18a5f9e94c7a48133a43 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. (From meta-yocto rev: 7a93139bcaca7639da0f182356153d2a7539e0c3) Signed-off-by: Tom Zanussi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc') 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 -- cgit v1.2.3-54-g00ecf