[yocto] [PATCH 06/22][KERNEL] meta/crownbay: factor out policy-related options

[tom.zanussi at intel.com]

From: Tom Zanussi <tom.zanussi at intel.com>

Refactor bsp/common-pc/crownbay* to keep hardware-related options in
the base crownbay.scc while moving the more 'policy'-related options
into the files that include the base crownbay.scc fragment.

This allows the different kernel types to make use of the basic
machine support without dragging along possibly unwanted options that
fall under the heading of 'policy' for a specific kernel type.

Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
 .../bsp/crownbay/crownbay-preempt-rt.scc           |    8 ++++++++
 .../bsp/crownbay/crownbay-standard.scc             |    7 +++++++
 meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc    |    8 --------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/crownbay/crownbay-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/crownbay/crownbay-preempt-rt.scc
index d58b4be..11067ef 100644
--- a/meta/cfg/kernel-cache/bsp/crownbay/crownbay-preempt-rt.scc
+++ b/meta/cfg/kernel-cache/bsp/crownbay/crownbay-preempt-rt.scc
@@ -4,4 +4,12 @@ define KARCH i386
 
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
+
 include crownbay.scc
+
+# default policy for preempt-rt kernels
+include cfg/usb-mass-storage.scc
+include cfg/boot-live.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
diff --git a/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc b/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc
index d6036f7..dd9dbc7 100644
--- a/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc
@@ -9,3 +9,10 @@ include features/emgd/emgd-1.10.scc
 git merge emgd-1.10
 
 include crownbay.scc
+
+# default policy for standard kernels
+include cfg/usb-mass-storage.scc
+include cfg/boot-live.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
diff --git a/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc b/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc
index c4bc1a5..08e3083 100644
--- a/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc
+++ b/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc
@@ -8,16 +8,8 @@ include cfg/dmaengine.scc
 include features/serial/8250.scc
 include features/hpet/hpet.scc
 include cfg/vesafb.scc
-include cfg/usb-mass-storage.scc
-include cfg/boot-live.scc
 include cfg/smp.scc
 include features/power/intel.scc
 
-include features/logbuf/size-normal.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-
 include features/usb/ehci-hcd.scc
 include features/usb/ohci-hcd.scc
-include features/usb/uhci-hcd.scc
-- 
1.7.0.4