diff options
| author | Tom Zanussi <tom.zanussi@intel.com> | 2012-08-07 13:41:20 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-25 14:47:05 +0100 |
| commit | e352d263f3e263ee6a3e18a5f9e94c7a48133a43 (patch) | |
| tree | 66585ad8ce95c85bdd3eb798bc1b6211c4ae6d7f /scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | |
| parent | b8e6eb60b7a91da18abdf742366159b895c87bb6 (diff) | |
| download | poky-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>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc')
| -rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | 4 |
1 files changed, 4 insertions, 0 deletions
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": }} |
| 7 | branch {{=machine}} | 7 | branch {{=machine}} |
| 8 | 8 | ||
| 9 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} | ||
| 10 | include features/emgd/emgd-1.10.scc | ||
| 11 | git merge emgd-1.10 | ||
| 12 | |||
| 9 | include {{=machine}}.scc | 13 | include {{=machine}}.scc |
| 10 | 14 | ||
| 11 | # default policy for standard kernels | 15 | # default policy for standard kernels |