On Fri, 2012-05-11 at 09:15 -0700, Darren Hart wrote: > > On 05/10/2012 06:00 PM, [email protected] wrote: > > From: Tom Zanussi <[email protected]> > > > > Refactor bsp/common-pc/common-pc* to keep hardware-related options in > > the base common-pc.scc while moving the more 'policy'-related options > > into the files that include the base common-pc.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 <[email protected]> > > --- > > .../bsp/common-pc/common-pc-preempt-rt.scc | 7 +++++++ > > .../bsp/common-pc/common-pc-standard.scc | 6 ++++++ > > .../kernel-cache/bsp/common-pc/common-pc-tiny.scc | 5 +---- > > meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc | 4 ---- > > 4 files changed, 14 insertions(+), 8 deletions(-) > > > > diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-preempt-rt.scc > > b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-preempt-rt.scc > > index f8716ee..706f669 100644 > > --- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-preempt-rt.scc > > +++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-preempt-rt.scc > > @@ -4,4 +4,11 @@ define KARCH i386 > > > > # no new branch required, re-use the ktypes/preempt-rt branch > > include ktypes/preempt-rt > > + > > include bsp/common-pc/common-pc.scc > > + > > +# default policy for preempt-rt kernels > > > needs usb-mass-storage here >
Again, note that the original common-pc* doesn't have these options other than CONFIG_USB_STORAGE and CONFIG_SCSI. > > +include cfg/boot-live.scc > > +include features/latencytop/latencytop.scc > > +include features/profiling/profiling.scc > > +include cfg/virtio.scc > > diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-standard.scc > > b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-standard.scc > > index f5baf52..83d49fd 100644 > > --- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-standard.scc > > +++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-standard.scc > > @@ -6,3 +6,9 @@ include ktypes/standard > > branch common-pc > > > > include common-pc.scc > > + > > +# default policy for standard kernels > > needs usb-mass-storage here and the config removed from common-pc.cfg > Same here... Tom > > +include cfg/boot-live.scc > > +include features/latencytop/latencytop.scc > > +include features/profiling/profiling.scc > > +include cfg/virtio.scc > > diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-tiny.scc > > b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-tiny.scc > > index 8d7a498..900eb27 100644 > > --- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-tiny.scc > > +++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-tiny.scc > > @@ -5,8 +5,5 @@ define KARCH i386 > > include ktypes/tiny > > branch common-pc > > > > -# Don't include common-pc.scc directly, > > -# it pulls in too many non-hardware options > > -kconf hardware common-pc.cfg > > -kconf hardware common-pc-gfx.cfg > > +include common-pc.scc > > Nice! > > > diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc > > b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc > > index 2338ea6..9bd72c1 100644 > > --- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc > > +++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc > > @@ -1,11 +1,7 @@ > > kconf hardware common-pc.cfg > > kconf hardware common-pc-gfx.cfg > > > > -include cfg/boot-live.scc > > include features/usb/ehci-hcd.scc > > include features/usb/uhci-hcd.scc > > include features/intel-e1xxxx/intel-e100.scc > > include features/intel-e1xxxx/intel-e1xxxx.scc > > -include features/latencytop/latencytop.scc > > -include features/profiling/profiling.scc > > -include cfg/virtio.scc > > Nice. > _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
