Commit 06b718c0 authored Nov 11, 2014 by Gerd Hoffmann

break kconfig dependency loop

After adding virtio-gpu I get this funky kconfig dependency loop.

scripts/kconfig/conf --oldconfig Kconfig
drivers/video/fbdev/Kconfig:5:error: recursive dependency detected!
drivers/video/fbdev/Kconfig:5: symbol FB is selected by DRM_KMS_FB_HELPER
drivers/gpu/drm/Kconfig:34: symbol DRM_KMS_FB_HELPER is selected by DRM_VIRTIO_GPU
drivers/gpu/drm/virtio/Kconfig:1: symbol DRM_VIRTIO_GPU depends on VIRTIO
drivers/virtio/Kconfig:1: symbol VIRTIO is selected by REMOTEPROC
drivers/remoteproc/Kconfig:4: symbol REMOTEPROC is selected by OMAP_REMOTEPROC
drivers/remoteproc/Kconfig:12: symbol OMAP_REMOTEPROC depends on OMAP_IOMMU
drivers/iommu/Kconfig:141: symbol OMAP_IOMMU is selected by VIDEO_OMAP3
drivers/media/platform/Kconfig:96: symbol VIDEO_OMAP3 depends on VIDEO_V4L2
drivers/media/v4l2-core/Kconfig:6: symbol VIDEO_V4L2 depends on I2C
drivers/i2c/Kconfig:7: symbol I2C is selected by FB_DDC
drivers/video/fbdev/Kconfig:59: symbol FB_DDC is selected by FB_CYBER2000_DDC
drivers/video/fbdev/Kconfig:374: symbol FB_CYBER2000_DDC depends on FB_CYBER2000
drivers/video/fbdev/Kconfig:362: symbol FB_CYBER2000 depends on FB

Making VIDEO_OMAP3 depend on OMAP_IOMMU instead of selecting it breaks the
loop, which looks like the best way to handle it to me. Updated OMAP_IOMMU
help text accordingly.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

parent 95872b49

drivers/iommu/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,9 @@ config OMAP_IOMMU
		depends on ARM && MMU
		depends on ARCH_OMAP2PLUS \|\| COMPILE_TEST
		select IOMMU_API
		---help---
		The OMAP3 media platform drivers depend on iommu support,
		if you need them say Y here.

		config OMAP_IOMMU_DEBUG
		bool "Export OMAP IOMMU internals in DebugFS"

drivers/media/platform/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -87,8 +87,8 @@ config VIDEO_OMAP3
		tristate "OMAP 3 Camera support"
		depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3
		depends on HAS_DMA
		depends on OMAP_IOMMU
		select ARM_DMA_USE_IOMMU
		select OMAP_IOMMU
		select VIDEOBUF2_DMA_CONTIG
		select MFD_SYSCON
		---help---

Admin message