diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-03-11 00:37:06 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-17 23:10:28 +0000 |
| commit | 6911fd0889261fb173775727db61dffaac355ed7 (patch) | |
| tree | 85b899adba9b1efe3554811b6ba2a0ddd36839f7 /scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc | |
| parent | 04d15f567d0493654df519f404f564e2591e9453 (diff) | |
| download | poky-6911fd0889261fb173775727db61dffaac355ed7.tar.gz | |
yocto-bsp: upgrade i386 template with emgd 1.16
Along with related changes.
(From meta-yocto rev: 6e93c881e2323b57f5b102db3b2b54220a06a1b6)
Signed-off-by: Tom Zanussi <tom.zanussi@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/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc')
| -rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc index e34882f93d..1b22eab9ad 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc | |||
| @@ -7,8 +7,7 @@ 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.14.scc | 10 | include features/drm-emgd/emgd-1.16.scc |
| 11 | git merge emgd-1.14 | ||
| 12 | 11 | ||
| 13 | include {{=machine}}.scc | 12 | include {{=machine}}.scc |
| 14 | 13 | ||