[yocto] [PATCH 09/22][KERNEL] meta/jasperforest: factor out policy-related options

[tom.zanussi at intel.com]

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

Refactor bsp/common-pc/jasperforest* to keep hardware-related options
in the base jasperforest.scc while moving the more 'policy'-related
options into the files that include the base jasperforest.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/jasperforest/jasperforest-preempt-rt.scc   |    7 +++++++
 .../bsp/jasperforest/jasperforest-standard.scc     |    6 ++++++
 .../kernel-cache/bsp/jasperforest/jasperforest.scc |   10 ----------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest-preempt-rt.scc
index 4b5c2ca..b3a6370 100644
--- a/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest-preempt-rt.scc
+++ b/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest-preempt-rt.scc
@@ -5,4 +5,11 @@ define KARCH x86_64
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
 include bsp/common-pc-64/common-pc-64.scc
+
 include jasperforest.scc
+
+# default policy for preempt-rt kernels
+include cfg/usb-mass-storage.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/jasperforest/jasperforest-standard.scc b/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest-standard.scc
index baf66d8..ec7a10a 100644
--- a/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest-standard.scc
@@ -6,3 +6,9 @@ include bsp/common-pc-64/common-pc-64-standard
 branch jasperforest
 
 include jasperforest.scc
+
+# default policy for standard kernels
+include cfg/usb-mass-storage.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/jasperforest/jasperforest.scc b/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.scc
index 82f0f52..f27a473 100644
--- a/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.scc
+++ b/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.scc
@@ -2,14 +2,4 @@ kconf hardware jasperforest.cfg
 
 include features/serial/8250.scc
 include cfg/vesafb.scc
-include cfg/usb-mass-storage.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