Ok. I sent a new pull request after removing the merge line. Thanks Kishore.
-----Original Message----- From: Bruce Ashfield [mailto:bruce.ashfi...@windriver.com] Sent: Sunday, February 26, 2012 9:26 PM To: Bodke, Kishore K Cc: yocto@yoctoproject.org Subject: Re: [KERNEL][PATCH 1/1] enable pvr features. On 12-02-24 7:35 PM, kishore.k.bo...@intel.com wrote: > From: Kishore Bodke<kishore.k.bo...@intel.com> > > Cedartrail has pvr kernel features and patches. > > Signed-off-by: Kishore Bodke<kishore.k.bo...@intel.com> > --- > meta/cfg/kernel-cache/cfg/drm-cdvpvr.cfg | 9 +++++++++ > meta/cfg/kernel-cache/cfg/drm-cdvpvr.scc | 2 ++ > 2 files changed, 11 insertions(+), 0 deletions(-) > create mode 100644 meta/cfg/kernel-cache/cfg/drm-cdvpvr.cfg > create mode 100644 meta/cfg/kernel-cache/cfg/drm-cdvpvr.scc > > diff --git a/meta/cfg/kernel-cache/cfg/drm-cdvpvr.cfg > b/meta/cfg/kernel-cache/cfg/drm-cdvpvr.cfg > new file mode 100644 > index 0000000..0ab4488 > --- /dev/null > +++ b/meta/cfg/kernel-cache/cfg/drm-cdvpvr.cfg > @@ -0,0 +1,9 @@ > +CONFIG_HIGHMEM4G=y > +CONFIG_STAGING=y > +CONFIG_DRM=y > +CONFIG_SND_HDA_CODEC_HDMI=y > +CONFIG_DRM_INTEL_CDV=y > +CONFIG_DRM_CDV_RELEASE=y > + > +# CONFIG_DRM_CDV_DEBUG is not set > +# CONFIG_DRM_PVR_PDUMP is not se > diff --git a/meta/cfg/kernel-cache/cfg/drm-cdvpvr.scc > b/meta/cfg/kernel-cache/cfg/drm-cdvpvr.scc > new file mode 100644 > index 0000000..fbb8316 > --- /dev/null > +++ b/meta/cfg/kernel-cache/cfg/drm-cdvpvr.scc > @@ -0,0 +1,2 @@ > +kconf hardware drm-cdvpvr.cfg > +git merge yocto/pvr I was just completing the merge on this, and I realized that we should put the branch merge in the BSP/machine, not in the generic feature. The configs are good, but we want the cedartrail to do that merge, not the config. How does that sound to you ? If it is ok, spin me a patch with that merge line removed and I'll push it out right away. Cheers, Bruce _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto