[yocto] [PATCH 6/6] fri2: Move non-hardware optional features out of fri2.scc

[Bruce Ashfield]

On 12-03-01 06:59 PM, Darren Hart wrote:
> From: Darren Hart<dvhart at linux.intel.com>
>
> Move policy features out of fri2.scc and into the fri2-KTYPE.scc files. This
> allows KTYPEs like tiny to build smaller kernels while still reusing the
> fri2.scc file.

Exactly. Good factoring of the options.

I had one question on the series, but I've merged it all anyway. If
we need to change the PCH console one, I'll revisit it later.

Cheers,

Bruce

>
> Signed-off-by: Darren Hart<dvhart at linux.intel.com>
> ---
>   meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc |    6 ++++++
>   meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc   |    6 ++++++
>   meta/cfg/kernel-cache/bsp/fri2/fri2.scc            |    6 ------
>   3 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc
> index 9e9a84c..1a9e638 100644
> --- a/meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc
> +++ b/meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc
> @@ -5,4 +5,10 @@ define KARCH i386
>   # no new branch required, re-use the ktypes/preempt-rt branch
>   include ktypes/preempt-rt
>   include fri2.scc
> +
> +# default policy for preempt-rt kernels
> +include cfg/boot-live.scc
> +include features/logbuf/size-normal.scc
> +include features/latencytop/latencytop.scc
> +include features/profiling/profiling.scc
>   include cfg/efi-ext.scc
> diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
> index b17eca5..66b87ce 100644
> --- a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
> +++ b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
> @@ -9,4 +9,10 @@ include features/emgd/emgd.scc
>   git merge emgd
>
>   include fri2.scc
> +
> +# default policy for standard kernels
> +include cfg/boot-live.scc
> +include features/logbuf/size-normal.scc
> +include features/latencytop/latencytop.scc
> +include features/profiling/profiling.scc
>   include cfg/efi-ext.scc
> diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2.scc b/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
> index a89a6e2..62ad14b 100644
> --- a/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
> +++ b/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
> @@ -9,12 +9,6 @@ include features/ericsson-3g/f5521gw.scc
>   include features/iwlagn/iwlagn.scc
>   include cfg/vesafb.scc
>   include cfg/usb-mass-storage.scc
> -include cfg/boot-live.scc
>   include features/power/intel.scc
>   include cfg/smp.scc
>   include cfg/efi.scc
> -
> -include features/logbuf/size-normal.scc
> -
> -include features/latencytop/latencytop.scc
> -include features/profiling/profiling.scc