On 08/17/2011 09:50 AM, [email protected] wrote: > From: Tom Zanussi <[email protected]> > > Add scc commands to merge the yocto/emgd branch into the fri2 BSP. > > Signed-off-by: Tom Zanussi <[email protected]>
Acked-by: Darren Hart <[email protected]> > --- > meta/cfg/kernel-cache/bsp/fri2/fri2.scc | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2.scc > b/meta/cfg/kernel-cache/bsp/fri2/fri2.scc > index 6ac0bfb..a87ce7e 100644 > --- a/meta/cfg/kernel-cache/bsp/fri2/fri2.scc > +++ b/meta/cfg/kernel-cache/bsp/fri2/fri2.scc > @@ -1,5 +1,7 @@ > kconf hardware fri2.cfg > > +git merge yocto/emgd > + > include features/eg20t/eg20t.scc > include features/intel-e1xxxx/intel-e1xxxx.scc > include features/dmaengine/dmaengine.scc -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
