diff mbox series

[05/75] media: imx: Compile imx6-media-objs only for CONFIG_VIDEO_IMX_CSI

Message ID 20210105152852.5733-6-laurent.pinchart@ideasonboard.com (mailing list archive)
State New
Headers show
Series media: imx: Miscellaneous fixes and cleanups for i.MX7 | expand

Commit Message

Laurent Pinchart Jan. 5, 2021, 3:27 p.m. UTC
imx6-media-objs contains a set of objects that are specific to the i.MX6
IPU-based media subsystem. They're not needed for the i.MX7 CSI. Only
compile them if CONFIG_VIDEO_IMX_CSI is selected.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 drivers/staging/media/imx/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Ezequiel Garcia Jan. 8, 2021, 5:42 p.m. UTC | #1
On Tue, 2021-01-05 at 17:27 +0200, Laurent Pinchart wrote:
> imx6-media-objs contains a set of objects that are specific to the i.MX6
> IPU-based media subsystem. They're not needed for the i.MX7 CSI. Only
> compile them if CONFIG_VIDEO_IMX_CSI is selected.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  drivers/staging/media/imx/Makefile | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
> index 9bd9e873ba7c..6ac33275cc97 100644
> --- a/drivers/staging/media/imx/Makefile
> +++ b/drivers/staging/media/imx/Makefile
> @@ -1,16 +1,16 @@
>  # SPDX-License-Identifier: GPL-2.0
> +imx-media-common-objs := imx-media-capture.o imx-media-dev-common.o \
> +       imx-media-of.o imx-media-utils.o
> +
>  imx6-media-objs := imx-media-dev.o imx-media-internal-sd.o \
>         imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o imx-media-vdic.o \
>         imx-media-csc-scaler.o
>  
> -imx-media-common-objs := imx-media-capture.o imx-media-dev-common.o \
> -       imx-media-of.o imx-media-utils.o
> -
>  imx6-media-csi-objs := imx-media-csi.o imx-media-fim.o
>  
> -obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media.o
>  obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-common.o
>  
> +obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media.o
>  obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media-csi.o
>  obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o
>  

Nice change. This shows more clearly what's shared and what not.

Would it be too hard to walk the extra kilometer (not necesarily now,
not necesarily looking at you do it) split imx6 and imx7 better,
so we can start thinking what's needed to destage imx6?

I don't think the imx6 support is all that bad that it has
to live in staging.

Thanks,
Ezequiel
Laurent Pinchart Jan. 8, 2021, 5:47 p.m. UTC | #2
Hi Ezequiel,

On Fri, Jan 08, 2021 at 02:42:32PM -0300, Ezequiel Garcia wrote:
> On Tue, 2021-01-05 at 17:27 +0200, Laurent Pinchart wrote:
> > imx6-media-objs contains a set of objects that are specific to the i.MX6
> > IPU-based media subsystem. They're not needed for the i.MX7 CSI. Only
> > compile them if CONFIG_VIDEO_IMX_CSI is selected.
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> >  drivers/staging/media/imx/Makefile | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
> > index 9bd9e873ba7c..6ac33275cc97 100644
> > --- a/drivers/staging/media/imx/Makefile
> > +++ b/drivers/staging/media/imx/Makefile
> > @@ -1,16 +1,16 @@
> >  # SPDX-License-Identifier: GPL-2.0
> > +imx-media-common-objs := imx-media-capture.o imx-media-dev-common.o \
> > +       imx-media-of.o imx-media-utils.o
> > +
> >  imx6-media-objs := imx-media-dev.o imx-media-internal-sd.o \
> >         imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o imx-media-vdic.o \
> >         imx-media-csc-scaler.o
> >  
> > -imx-media-common-objs := imx-media-capture.o imx-media-dev-common.o \
> > -       imx-media-of.o imx-media-utils.o
> > -
> >  imx6-media-csi-objs := imx-media-csi.o imx-media-fim.o
> >  
> > -obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media.o
> >  obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-common.o
> >  
> > +obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media.o
> >  obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media-csi.o
> >  obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o
> 
> Nice change. This shows more clearly what's shared and what not.
> 
> Would it be too hard to walk the extra kilometer (not necesarily now,
> not necesarily looking at you do it) split imx6 and imx7 better,
> so we can start thinking what's needed to destage imx6?

I'd really welcome that, but I'd like to get this series merged first.
Unless you want a v2 with twice the number of patches ;-)

> I don't think the imx6 support is all that bad that it has
> to live in staging.
Ezequiel Garcia Jan. 8, 2021, 6:05 p.m. UTC | #3
On Fri, 2021-01-08 at 19:47 +0200, Laurent Pinchart wrote:
> Hi Ezequiel,
> 
> On Fri, Jan 08, 2021 at 02:42:32PM -0300, Ezequiel Garcia wrote:
> > On Tue, 2021-01-05 at 17:27 +0200, Laurent Pinchart wrote:
> > > imx6-media-objs contains a set of objects that are specific to the i.MX6
> > > IPU-based media subsystem. They're not needed for the i.MX7 CSI. Only
> > > compile them if CONFIG_VIDEO_IMX_CSI is selected.
> > > 
> > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > ---
> > >  drivers/staging/media/imx/Makefile | 8 ++++----
> > >  1 file changed, 4 insertions(+), 4 deletions(-)
> > > 
> > > diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
> > > index 9bd9e873ba7c..6ac33275cc97 100644
> > > --- a/drivers/staging/media/imx/Makefile
> > > +++ b/drivers/staging/media/imx/Makefile
> > > @@ -1,16 +1,16 @@
> > >  # SPDX-License-Identifier: GPL-2.0
> > > +imx-media-common-objs := imx-media-capture.o imx-media-dev-common.o \
> > > +       imx-media-of.o imx-media-utils.o
> > > +
> > >  imx6-media-objs := imx-media-dev.o imx-media-internal-sd.o \
> > >         imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o imx-media-vdic.o \
> > >         imx-media-csc-scaler.o
> > >  
> > > -imx-media-common-objs := imx-media-capture.o imx-media-dev-common.o \
> > > -       imx-media-of.o imx-media-utils.o
> > > -
> > >  imx6-media-csi-objs := imx-media-csi.o imx-media-fim.o
> > >  
> > > -obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media.o
> > >  obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-common.o
> > >  
> > > +obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media.o
> > >  obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media-csi.o
> > >  obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o
> > 
> > Nice change. This shows more clearly what's shared and what not.
> > 
> > Would it be too hard to walk the extra kilometer (not necesarily now,
> > not necesarily looking at you do it) split imx6 and imx7 better,
> > so we can start thinking what's needed to destage imx6?
> 
> I'd really welcome that, but I'd like to get this series merged first.
> Unless you want a v2 with twice the number of patches ;-)
> 

Well, maybe that'd make you set a new record :)

Feel free to add:

Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>

Thanks,
Ezequiel
diff mbox series

Patch

diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
index 9bd9e873ba7c..6ac33275cc97 100644
--- a/drivers/staging/media/imx/Makefile
+++ b/drivers/staging/media/imx/Makefile
@@ -1,16 +1,16 @@ 
 # SPDX-License-Identifier: GPL-2.0
+imx-media-common-objs := imx-media-capture.o imx-media-dev-common.o \
+	imx-media-of.o imx-media-utils.o
+
 imx6-media-objs := imx-media-dev.o imx-media-internal-sd.o \
 	imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o imx-media-vdic.o \
 	imx-media-csc-scaler.o
 
-imx-media-common-objs := imx-media-capture.o imx-media-dev-common.o \
-	imx-media-of.o imx-media-utils.o
-
 imx6-media-csi-objs := imx-media-csi.o imx-media-fim.o
 
-obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media.o
 obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-common.o
 
+obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media.o
 obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media-csi.o
 obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o