From: Tom Zanussi <tom.zanu...@intel.com> Refactor bsp/common-pc/fishriver* to keep hardware-related options in the base fishriver.scc while moving the more 'policy'-related options into the files that include the base fishriver.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/fishriver/fishriver-preempt-rt.scc | 8 ++++++++ .../bsp/fishriver/fishriver-standard.scc | 8 ++++++++ meta/cfg/kernel-cache/bsp/fishriver/fishriver.scc | 8 -------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/meta/cfg/kernel-cache/bsp/fishriver/fishriver-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/fishriver/fishriver-preempt-rt.scc index 1a5e46a..f37e1c6 100644 --- a/meta/cfg/kernel-cache/bsp/fishriver/fishriver-preempt-rt.scc +++ b/meta/cfg/kernel-cache/bsp/fishriver/fishriver-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 fishriver.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/fishriver/fishriver-standard.scc b/meta/cfg/kernel-cache/bsp/fishriver/fishriver-standard.scc index e697d7e..fb2dc25 100644 --- a/meta/cfg/kernel-cache/bsp/fishriver/fishriver-standard.scc +++ b/meta/cfg/kernel-cache/bsp/fishriver/fishriver-standard.scc @@ -9,3 +9,11 @@ include features/emgd/emgd.scc git merge emgd include fishriver.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/fishriver/fishriver.scc b/meta/cfg/kernel-cache/bsp/fishriver/fishriver.scc index e401274..f06618b 100644 --- a/meta/cfg/kernel-cache/bsp/fishriver/fishriver.scc +++ b/meta/cfg/kernel-cache/bsp/fishriver/fishriver.scc @@ -8,16 +8,8 @@ include features/serial/8250.scc include features/hpet/hpet.scc include features/ericsson-3g/f5521gw.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 _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
