[PATCH 04/48] drm: omapdrm: Merge the omapdss and omapdss-base modules

[Laurent Pinchart]

Hi Sebastian,

On Saturday, 14 October 2017 15:22:00 EEST Sebastian Reichel wrote:
> On Fri, Oct 13, 2017 at 05:59:00PM +0300, Laurent Pinchart wrote:
> > There's no need for the omapdss-base code to be part of a separate
> > module. Merge it with the omapdss module. This allows removing the
> > exports for internal symbols.
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> > ---
> > 
> >  drivers/gpu/drm/omapdrm/dss/Kconfig   |  4 ----
> >  drivers/gpu/drm/omapdrm/dss/Makefile  | 19 +++++++++++++------
> >  drivers/gpu/drm/omapdrm/dss/base.c    |  7 -------
> >  drivers/gpu/drm/omapdrm/dss/display.c |  2 --
> >  drivers/gpu/drm/omapdrm/dss/dss-of.c  |  2 --
> >  drivers/gpu/drm/omapdrm/dss/output.c  | 14 --------------
> >  6 files changed, 13 insertions(+), 35 deletions(-)

[snip]

> > diff --git a/drivers/gpu/drm/omapdrm/dss/Makefile
> > b/drivers/gpu/drm/omapdrm/dss/Makefile index 3c5644c3fc38..531b4d8075e5
> > 100644
> > --- a/drivers/gpu/drm/omapdrm/dss/Makefile
> > +++ b/drivers/gpu/drm/omapdrm/dss/Makefile
> > @@ -1,12 +1,19 @@
> >  obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o
> > -
> > -obj-$(CONFIG_OMAP_DSS_BASE) += omapdss-base.o
> > -omapdss-base-y := base.o display.o dss-of.o output.o
> > -
> >  obj-$(CONFIG_OMAP2_DSS) += omapdss.o
> > +
> >  # Core DSS files
> > -omapdss-y := core.o dss.o dispc.o dispc_coefs.o \
> > -	pll.o video-pll.o
> > +omapdss-y := \
> > +	base.o \
> > +	display.o \
> > +	dss-of.o \
> > +	output.o \
> > +	core.o \
> > +	dss.o \
> > +	dispc.o \
> > +	dispc_coefs.o \
> > +	pll.o \
> > +	video-pll.o
> > +
> 
> I guess it makes sense to sort this alphabetically, otherwise:

Good point. I'll do that in v2, and will also sort the entries below.

> Reviewed-by: Sebastian Reichel <sebastian.reichel at collabora.co.uk>
> 
> -- Sebastian
> 
> >  omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o
> >  omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o
> >  omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o

[snip]

-- 
Regards,

Laurent Pinchart