diff options
| author | Tom Zanussi <tom.zanussi@intel.com> | 2012-08-08 09:33:32 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-25 14:47:06 +0100 |
| commit | 4bb2e2f6b364ad05791810c5ecc8783c2cb777ce (patch) | |
| tree | af6d217047b1ac8275274ef9793ee531d026f345 /scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | |
| parent | d8b00e744b7b1d5a66930f91a4bce1945434ee82 (diff) | |
| download | poky-4bb2e2f6b364ad05791810c5ecc8783c2cb777ce.tar.gz | |
yocto-bsp: use emgd 1.14 for i386 template
Make i386 template use emgd 1.14, along with associated changes.
(From meta-yocto rev: 69f49f7e8370112164b70b9a5ae6f3c0e1ce0bfa)
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, 2 insertions, 2 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 024af30b04..c6f42db4cf 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 | |||
| @@ -7,8 +7,8 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch) | |||
| 7 | branch {{=machine}} | 7 | branch {{=machine}} |
| 8 | 8 | ||
| 9 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} | 9 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} |
| 10 | include features/emgd/emgd-1.10.scc | 10 | include features/emgd/emgd-1.14.scc |
| 11 | git merge emgd-1.10 | 11 | git merge emgd-1.14 |
| 12 | 12 | ||
| 13 | include {{=machine}}.scc | 13 | include {{=machine}}.scc |
| 14 | 14 | ||