[PATCH] drivers: omap2: Kconfig: make FB_OMAP2_DSS_INIT depend on OF

[Bartlomiej Zolnierkiewicz]

On Friday, May 04, 2018 09:45:26 AM Mauro Carvalho Chehab wrote:
> Em Fri, 04 May 2018 13:05:17 +0200
> Bartlomiej Zolnierkiewicz <b.zolnierkie at samsung.com> escreveu:
> 
> > On Friday, May 04, 2018 07:59:06 AM Mauro Carvalho Chehab wrote:
> > > Em Fri, 04 May 2018 12:48:46 +0200
> > > Bartlomiej Zolnierkiewicz <b.zolnierkie at samsung.com> escreveu:
> > >   
> > > > On Thursday, May 03, 2018 08:48:56 AM Randy Dunlap wrote:  
> > > > > On 04/20/2018 04:25 AM, Anders Roxell wrote:    
> > > > > > Commit 7378f1149884 ("media: omap2: omapfb: allow building it with
> > > > > > COMPILE_TEST") broke compilation without CONFIG_OF selected.
> > > > > >   CC      drivers/video/fbdev/core/fbmem.o
> > > > > > drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c: In function ‘omapdss_update_prop’:
> > > > > > drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c:68:2: error: implicit declaration of function ‘of_update_property’; did you mean ‘of_get_property’? [-Werror=implicit-function-declaration]
> > > > > >   of_update_property(node, prop);
> > > > > >   ^~~~~~~~~~~~~~~~~~
> > > > > >   of_get_property
> > > > > > cc1: some warnings being treated as errors
> > > > > > scripts/Makefile.build:312: recipe for target 'drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.o' failed
> > > > > > make[7]: *** [drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.o] Error 1
> > > > > > scripts/Makefile.build:559: recipe for target 'drivers/video/fbdev/omap2/omapfb/dss' failed
> > > > > > make[6]: *** [drivers/video/fbdev/omap2/omapfb/dss] Error 2
> > > > > > make[6]: *** Waiting for unfinished jobs....
> > > > > > 
> > > > > > Add OF dependency in order to make all configurations work again.
> > > > > > 
> > > > > > of_update_property() has no inline stub, and that that could be added as
> > > > > > an alternative.
> > > > > > 
> > > > > > Signed-off-by: Anders Roxell <anders.roxell at linaro.org>
> > > > > > ---
> > > > > >  drivers/video/fbdev/omap2/Kconfig | 2 +-
> > > > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > > > 
> > > > > > diff --git a/drivers/video/fbdev/omap2/Kconfig b/drivers/video/fbdev/omap2/Kconfig
> > > > > > index 82008699d253..4de381f2452e 100644
> > > > > > --- a/drivers/video/fbdev/omap2/Kconfig
> > > > > > +++ b/drivers/video/fbdev/omap2/Kconfig
> > > > > > @@ -1,4 +1,4 @@
> > > > > > -if ARCH_OMAP2PLUS || COMPILE_TEST
> > > > > > +if OF && (ARCH_OMAP2PLUS || COMPILE_TEST)
> > > > > >  
> > > > > >  source "drivers/video/fbdev/omap2/omapfb/Kconfig"
> > > > > >  
> > > > > >     
> > > > > 
> > > > > Hi,
> > > > > 
> > > > > This patch certainly fixes the build errors that I have been seeing in
> > > > > linux-next for several days now, so:
> > > > > 
> > > > > Acked-by: Randy Dunlap <rdunlap at infradead.org>
> > > > > Tested-by: Randy Dunlap <rdunlap at infradead.org>    
> > > > 
> > > > Thanks.
> > > > 
> > > > Since there has been no follow up from Mauro on this ([1]) I guess
> > > > that the best thing I can do is simply merging both patches to fbdev
> > > > tree..
> 
> When you're saying about "both" patches, you're referring to the
> original one plus this fix, right?

Right.

> > > > 
> > > > [1] https://www.spinics.net/lists/linux-media/msg132583.html  
> > > 
> > > Sorry, it seems I missed it. If you didn't merge them yet, I'll
> > > merge it on my tree today, if you think it would be best to have
> > > it together with the patch that enabled FB_OMAP builds with
> > > COMPILE_TEST.  
> 
> I know why I missed... I was not c/c at the original patch. Well,
> I received it at my LKML inbox, but nobody reads all LKML emails
> those days.
> 
> > 
> > This would be best indeed, you can add my ACK:
> > 
> > Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie at samsung.com>
> 
> Committed.

Thanks.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics