Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a78649d authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

platform: Check for ARCH_EXYNOS separately 



ARCH_EXYNOS is going to be excluded from PLAT_S5P, so it must be checked
separately in Exynos-related Kconfig entries.

Cc: linux-media@vger.kernel.org
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: Kamil Debski <k.debski@samsung.com>
Cc: Tomasz Stanislawski <t.stanislaws@samsung.com>
Cc: Jeongtae Park <jtp.park@samsung.com>
Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 105dddbf

drivers/media/platform/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ config VIDEO_MEM2MEM_DEINTERLACE 


config VIDEO_SAMSUNG_S5P_G2D

	tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"

	depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P

	depends on VIDEO_DEV && VIDEO_V4L2 && (PLAT_S5P || ARCH_EXYNOS)

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV

	default n
@@ -169,7 +169,7 @@ config VIDEO_SAMSUNG_S5P_G2D 


config VIDEO_SAMSUNG_S5P_JPEG

	tristate "Samsung S5P/Exynos4 JPEG codec driver"

	depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P

	depends on VIDEO_DEV && VIDEO_V4L2 && (PLAT_S5P || ARCH_EXYNOS)

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV

	---help---
@@ -177,7 +177,7 @@ config VIDEO_SAMSUNG_S5P_JPEG 


config VIDEO_SAMSUNG_S5P_MFC

	tristate "Samsung S5P MFC Video Codec"

	depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P

	depends on VIDEO_DEV && VIDEO_V4L2 && (PLAT_S5P || ARCH_EXYNOS)

	select VIDEOBUF2_DMA_CONTIG

	default n

	help

drivers/media/platform/exynos4-is/Kconfig

+2 −1
Original line number Diff line number Diff line 


config VIDEO_SAMSUNG_EXYNOS4_IS

	bool "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"

	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && PLAT_S5P && PM_RUNTIME

	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && PM_RUNTIME

	depends on (PLAT_S5P || ARCH_EXYNOS)

	help

	  Say Y here to enable camera host interface devices for

	  Samsung S5P and EXYNOS SoC series.

drivers/media/platform/s5p-tv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


config VIDEO_SAMSUNG_S5P_TV

	bool "Samsung TV driver for S5P platform"

	depends on PLAT_S5P && PM_RUNTIME

	depends on (PLAT_S5P || ARCH_EXYNOS) && PM_RUNTIME

	default n

	---help---

	  Say Y here to enable selecting the TV output devices for