From 7378f1149884b183631c6c16c0f1c62bcd7d759d Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 5 Apr 2018 13:28:26 -0400 Subject: media: omap2: omapfb: allow building it with COMPILE_TEST This driver builds cleanly with COMPILE_TEST, and it is needed in order to allow building drivers/media omap2 driver. So, change the logic there to allow building it. Acked-by: Tomi Valkeinen Signed-off-by: Mauro Carvalho Chehab --- drivers/video/fbdev/omap2/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/video') diff --git a/drivers/video/fbdev/omap2/Kconfig b/drivers/video/fbdev/omap2/Kconfig index 0921c4de8407..82008699d253 100644 --- a/drivers/video/fbdev/omap2/Kconfig +++ b/drivers/video/fbdev/omap2/Kconfig @@ -1,4 +1,4 @@ -if ARCH_OMAP2PLUS +if ARCH_OMAP2PLUS || COMPILE_TEST source "drivers/video/fbdev/omap2/omapfb/Kconfig" -- cgit v1.2.3 From 02489a1216d93abf76d45bc257cf27ecf00098c9 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Fri, 20 Apr 2018 13:25:51 +0200 Subject: drivers: omap2: Kconfig: make FB_OMAP2_DSS_INIT depend on OF MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Acked-by: Randy Dunlap Tested-by: Randy Dunlap Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Mauro Carvalho Chehab --- drivers/video/fbdev/omap2/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/video') 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" -- cgit v1.2.3