Indeed. I appear to have messed it up .. I had a lot of merges to do today, so I was sure to get something wrong.
This is now really merged. Bruce On Tue, Sep 3, 2019 at 9:57 PM Liwei Song <[email protected]> wrote: > > Hi Bruce, > > It seems that this patch was missed by master branch, so does 5.2 branch also > miss it. > Could you help merge it to both master and yocto-5.2 branch? > > > Thanks, > Liwei. > > > On 07/08/2019 04:22 PM, Liwei Song wrote: > > Enable CONFIG_DRM_MGAG200=m to support Matrox Electronics MGA G200 > > and include it in intel-x86 bsp. > > > > Signed-off-by: Liwei Song <[email protected]> > > --- > > bsp/intel-x86/intel-x86.scc | 1 + > > features/mgag200/mgag200.cfg | 1 + > > features/mgag200/mgag200.scc | 4 ++++ > > 3 files changed, 6 insertions(+) > > create mode 100644 features/mgag200/mgag200.cfg > > create mode 100644 features/mgag200/mgag200.scc > > > > diff --git a/bsp/intel-x86/intel-x86.scc b/bsp/intel-x86/intel-x86.scc > > index aee6d5e93db3..a93319d483a5 100644 > > --- a/bsp/intel-x86/intel-x86.scc > > +++ b/bsp/intel-x86/intel-x86.scc > > @@ -39,6 +39,7 @@ include features/tpm/tpm.scc > > include features/mfd/mfd-intel-lpss.scc > > include features/mmc/mmc-realtek.scc > > include features/intel-pinctrl/intel-pinctrl.scc > > +include features/mgag200/mgag200.scc > > > > kconf hardware intel-x86.cfg > > kconf hardware intel-x86-mga.cfg > > diff --git a/features/mgag200/mgag200.cfg b/features/mgag200/mgag200.cfg > > new file mode 100644 > > index 000000000000..48b6c6106fe0 > > --- /dev/null > > +++ b/features/mgag200/mgag200.cfg > > @@ -0,0 +1 @@ > > +CONFIG_DRM_MGAG200=m > > diff --git a/features/mgag200/mgag200.scc b/features/mgag200/mgag200.scc > > new file mode 100644 > > index 000000000000..6bb0e79608e9 > > --- /dev/null > > +++ b/features/mgag200/mgag200.scc > > @@ -0,0 +1,4 @@ > > +define KFEATURE_DESCRIPTION "Matrox Electronics Systems Ltd. MGA G200e > > support" > > +define KFEATURE_COMPATIBILITY board > > + > > +kconf hardware mgag200.cfg > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- _______________________________________________ linux-yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/linux-yocto
