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 <rdun...@infradead.org>
Signed-off-by: Fabio Estevam <feste...@gmail.com>
---
drivers/staging/media/imx/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/media/imx/Kconfig
b/drivers/staging/media/imx/Kconfig
index ad3d7df6bb3c..4c726345dc25 100644
--- a/drivers/staging/media/imx/Kconfig
+++ b/drivers/staging/media/imx/Kconfig
@@ -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
--
2.17.1
