From: Tom Zanussi <tom.zanu...@intel.com> Refactor bsp/common-pc/sugarbay* to keep hardware-related options in the base sugarbay.scc while moving the more 'policy'-related options into the files that include the base sugarbay.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.zanu...@intel.com> --- .../bsp/sugarbay/sugarbay-preempt-rt.scc | 7 +++++++ .../bsp/sugarbay/sugarbay-standard.scc | 6 ++++++ meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.scc | 10 ---------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay-preempt-rt.scc index e824f6f..d9df73b 100644 --- a/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay-preempt-rt.scc +++ b/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay-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 sugarbay.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/sugarbay/sugarbay-standard.scc b/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay-standard.scc index 8c2a19b..421364e 100644 --- a/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay-standard.scc +++ b/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay-standard.scc @@ -6,3 +6,9 @@ include bsp/common-pc-64/common-pc-64-standard branch sugarbay include sugarbay.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/sugarbay/sugarbay.scc b/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.scc index 128efd3..0b89549 100644 --- a/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.scc +++ b/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.scc @@ -2,14 +2,4 @@ kconf hardware sugarbay.cfg include features/i915/i915.scc include features/serial/8250.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 _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
