[yocto] [PATCH 3/7] sys940x: Move emgd-1.10 data to the standard scc file

Darren Hart dvhart at linux.intel.com
Tue May 1 15:13:27 PDT 2012


Make sys940x consistent with crownbay and fri2 by moving the
emgd-1.10 includes and merges to the $bsp-standard.scc files.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 .../kernel-cache/bsp/sys940x/sys940x-standard.scc  |    3 +++
 meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc      |    2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc b/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc
index 1f0edec..132e44a 100644
--- a/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc
@@ -2,5 +2,8 @@ define KMACHINE sys940x
 define KTYPE standard
 define KARCH i386
 
+include features/emgd/emgd-1.10.scc
+git merge emgd-1.10
+
 include ktypes/standard
 include sys940x.scc
diff --git a/meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc b/meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc
index 557a83d..962b837 100644
--- a/meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc
+++ b/meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc
@@ -1,7 +1,5 @@
 kconf hardware sys940x.cfg
 
-git merge emgd-1.10
-
 include features/eg20t/eg20t.scc
 include features/drm-emgd/drm-emgd.scc
 include cfg/dmaengine.scc
-- 
1.7.7.6




More information about the yocto mailing list