Skip to contentSkip to conversation

Revert "media: staging/imx: Allow driver to build if COMPILE_TEST is enabled"

PATCH In review Fabio Estevam 3 participants 3 messages Jun 5, 2019 – Jun 6, 2019

Subsystems (4)
Media (V4L/DVB) Arm i.MX and Layerscape Staging Media drivers for Freescale i.MX
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 Revert "media: staging/imx: Allow driver to build if COMPILE_TEST is enabled"

Commit 020bc7354a6e ("media: staging/imx: Allow driver to build if COMPILE_TEST is enabled") incorrectly assumed that the imx media driver had no build time dependency with IMX_IPUV3_CORE.

Building on x86_64 without IMX_IPUV3_CORE causes lots of build errors such as:

ld: drivers/staging/media/imx/imx-media-internal-sd.o: in function `imx_media_register_ipu_internal_subdevs':
imx-media-internal-sd.c:(.text+0xd1): undefined reference to `ipu_get_num'
ld: drivers/staging/media/imx/imx-ic-common.o: in function `imx_media_ic_register':
imx-ic-common.c:(.text+0xec): undefined reference to `ipu_get_num'

All these definitions come from the imx ipu3 core driver, so make sure that imx media depends on IMX_IPUV3_CORE.

This reverts commit 020bc7354a6ebec980e0aedf5bedf57b42f93aca.

Reported-by Randy Dunlap <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
 drivers/staging/media/imx/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/imx/Kconfig +1 -1
index ad3d7df6bb3c..4c726345dc25 100644
@@ -2,7 +2,7 @@
 config VIDEO_IMX_MEDIA
 	tristate "i.MX5/6 V4L2 media core driver"
 	depends on ARCH_MXC || COMPILE_TEST
-	depends on MEDIA_CONTROLLER && VIDEO_V4L2 && (IMX_IPUV3_CORE || COMPILE_TEST)
+	depends on MEDIA_CONTROLLER && VIDEO_V4L2 && IMX_IPUV3_CORE
 	depends on VIDEO_V4L2_SUBDEV_API
 	depends on HAS_DMA
 	select VIDEOBUF2_DMA_CONTIG
Signature · 1 line
2.17.1
Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines · Fabio Estevam

Commit 020bc7354a6e ("media: staging/imx: Allow driver to build if COMPILE_TEST is enabled") incorrectly assumed that the imx media driver had no build time dependency with IMX_IPUV3_CORE.

Building on x86_64 without IMX_IPUV3_CORE causes lots of build errors such as:

ld: drivers/staging/media/imx/imx-media-internal-sd.o: in function `imx_media_register_ipu_internal_subdevs':
imx-media-internal-sd.c:(.text+0xd1): undefined reference to `ipu_get_num'
ld: drivers/staging/media/imx/imx-ic-common.o: in function `imx_media_ic_register':
imx-ic-common.c:(.text+0xec): undefined reference to `ipu_get_num'

Quoted 7 lines

All these definitions come from the imx ipu3 core driver, so make sure that imx media depends on IMX_IPUV3_CORE.

This reverts commit 020bc7354a6ebec980e0aedf5bedf57b42f93aca.

Reported-by Randy Dunlap <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>

Works for me. Thanks.

Acked-by Randy Dunlap <[email protected]>
Quoted 18 lines
---
 drivers/staging/media/imx/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/imx/Kconfig +1 -1
index ad3d7df6bb3c..4c726345dc25 100644
@@ -2,7 +2,7 @@
 config VIDEO_IMX_MEDIA
 	tristate "i.MX5/6 V4L2 media core driver"
 	depends on ARCH_MXC || COMPILE_TEST
-	depends on MEDIA_CONTROLLER && VIDEO_V4L2 && (IMX_IPUV3_CORE || COMPILE_TEST)
+	depends on MEDIA_CONTROLLER && VIDEO_V4L2 && IMX_IPUV3_CORE
 	depends on VIDEO_V4L2_SUBDEV_API
 	depends on HAS_DMA
 	select VIDEOBUF2_DMA_CONTIG
Signature · 1 line
~Randy
#2 lore raw
In reply to Fabio Estevam
Quoted 28 lines · Fabio Estevam

Commit 020bc7354a6e ("media: staging/imx: Allow driver to build if COMPILE_TEST is enabled") incorrectly assumed that the imx media driver had no build time dependency with IMX_IPUV3_CORE.

Building on x86_64 without IMX_IPUV3_CORE causes lots of build errors such as:

ld: drivers/staging/media/imx/imx-media-internal-sd.o: in function `imx_media_register_ipu_internal_subdevs':
imx-media-internal-sd.c:(.text+0xd1): undefined reference to `ipu_get_num'
ld: drivers/staging/media/imx/imx-ic-common.o: in function `imx_media_ic_register':
imx-ic-common.c:(.text+0xec): undefined reference to `ipu_get_num'

All these definitions come from the imx ipu3 core driver, so make sure that imx media depends on IMX_IPUV3_CORE.

This reverts commit 020bc7354a6ebec980e0aedf5bedf57b42f93aca.

Reported-by Randy Dunlap <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
 drivers/staging/media/imx/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/imx/Kconfig +0 -0
index ad3d7df6bb3c..4c726345dc25 100644

drivers/staging/media/imx/Kconfig line 5

Quoted 5 lines
drivers/staging/media/imx/Kconfig +1 -1
@@ -2,7 +2,7 @@
 config VIDEO_IMX_MEDIA
 	tristate "i.MX5/6 V4L2 media core driver"
 	depends on ARCH_MXC || COMPILE_TEST
-	depends on MEDIA_CONTROLLER && VIDEO_V4L2 && (IMX_IPUV3_CORE || COMPILE_TEST)
+	depends on MEDIA_CONTROLLER && VIDEO_V4L2 && IMX_IPUV3_CORE

Can this driver just select IMX_IPUV3_CORE? IMX_IPUV3_CORE can handle TEST_COMPILE, so that might work.

Regards,

Hans

Quoted 4 lines
drivers/staging/media/imx/Kconfig +0 -0
 	depends on VIDEO_V4L2_SUBDEV_API
 	depends on HAS_DMA
 	select VIDEOBUF2_DMA_CONTIG