Skip to content

Commit

Permalink
media: platform: Create vendor/{Makefile,Kconfig} files
Browse files Browse the repository at this point in the history
Instead of placing multiple per-vendor entries at the
platform/{Makefile,Kconfig}, create them at the per-vendor
directories.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
  • Loading branch information
Mauro Carvalho Chehab committed Mar 18, 2022
1 parent 68f8ef6 commit f2ab6d3
Show file tree
Hide file tree
Showing 17 changed files with 79 additions and 46 deletions.
29 changes: 6 additions & 23 deletions drivers/media/platform/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -62,42 +62,25 @@ config VIDEO_MUX
This driver provides support for N:1 video bus multiplexers.

# Platform drivers - Please keep it alphabetically sorted

# TODO: create per-manufacturer directories

source "drivers/media/platform/allegro-dvt/Kconfig"
source "drivers/media/platform/am437x/Kconfig"
source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"
source "drivers/media/platform/amlogic/Kconfig"
source "drivers/media/platform/amphion/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
source "drivers/media/platform/atmel/Kconfig"
source "drivers/media/platform/cadence/Kconfig"
source "drivers/media/platform/chips-media/Kconfig"
source "drivers/media/platform/intel/Kconfig"
source "drivers/media/platform/marvell/Kconfig"
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
source "drivers/media/platform/mediatek/mtk-vpu/Kconfig"
source "drivers/media/platform/nvidia/tegra-vde/Kconfig"
source "drivers/media/platform/mediatek/Kconfig"
source "drivers/media/platform/nvidia/Kconfig"
source "drivers/media/platform/nxp/Kconfig"
source "drivers/media/platform/qcom/Kconfig"
source "drivers/media/platform/renesas/Kconfig"
source "drivers/media/platform/rockchip/Kconfig"
source "drivers/media/platform/samsung/exynos-gsc/Kconfig"
source "drivers/media/platform/samsung/exynos4-is/Kconfig"
source "drivers/media/platform/samsung/s3c-camif/Kconfig"
source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
source "drivers/media/platform/samsung/Kconfig"
source "drivers/media/platform/st/Kconfig"
source "drivers/media/platform/sunxi/Kconfig"
source "drivers/media/platform/st/sti/Kconfig"
source "drivers/media/platform/st/stm32/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
source "drivers/media/platform/ti/am437x/Kconfig"
source "drivers/media/platform/ti/davinci/Kconfig"
source "drivers/media/platform/ti/omap/Kconfig"
source "drivers/media/platform/ti/omap3isp/Kconfig"
source "drivers/media/platform/ti/Kconfig"
source "drivers/media/platform/via/Kconfig"
source "drivers/media/platform/xilinx/Kconfig"

Expand Down
29 changes: 7 additions & 22 deletions drivers/media/platform/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,23 @@
# Place here, alphabetically sorted by directory
# (e. g. LC_ALL=C sort Makefile)
obj-y += allegro-dvt/
obj-y += am437x/
obj-y += amlogic/meson-ge2d/
obj-y += amlogic/
obj-y += amphion/
obj-y += aspeed/
obj-y += atmel/
obj-y += cadence/
obj-y += chips-media/
obj-y += intel/
obj-y += marvell/
obj-y += mediatek/mtk-jpeg/
obj-y += mediatek/mtk-mdp/
obj-y += mediatek/mtk-vcodec/
obj-y += mediatek/mtk-vpu/
obj-y += nvidia/tegra-vde/
obj-y += mediatek/
obj-y += nvidia/
obj-y += nxp/
obj-y += qcom/camss/
obj-y += qcom/venus/
obj-y += qcom/
obj-y += renesas/
obj-y += rockchip/rga/
obj-y += rockchip/rkisp1/
obj-y += samsung/exynos-gsc/
obj-y += samsung/exynos4-is/
obj-y += samsung/s3c-camif/
obj-y += samsung/s5p-g2d/
obj-y += samsung/s5p-jpeg/
obj-y += samsung/s5p-mfc/
obj-y += rockchip/
obj-y += samsung/
obj-y += st/
obj-y += sunxi/
obj-y += st/sti/bdisp/
obj-y += st/sti/c8sectpfe/
obj-y += st/sti/delta/
obj-y += st/sti/hva/
obj-y += st/stm32/
obj-y += ti/
obj-y += via/
obj-y += xilinx/
Expand Down
2 changes: 2 additions & 0 deletions drivers/media/platform/amlogic/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"
2 changes: 2 additions & 0 deletions drivers/media/platform/amlogic/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-y += meson-ge2d/
3 changes: 3 additions & 0 deletions drivers/media/platform/amphion/Kconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only

comment "Amphion drivers"

config VIDEO_AMPHION_VPU
tristate "Amphion VPU (Video Processing Unit) Codec IP"
depends on V4L_MEM2MEM_DRIVERS
Expand Down
5 changes: 5 additions & 0 deletions drivers/media/platform/mediatek/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
source "drivers/media/platform/mediatek/mtk-vpu/Kconfig"
5 changes: 5 additions & 0 deletions drivers/media/platform/mediatek/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-y += mtk-jpeg/
obj-y += mtk-mdp/
obj-y += mtk-vcodec/
obj-y += mtk-vpu/
2 changes: 2 additions & 0 deletions drivers/media/platform/nvidia/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
source "drivers/media/platform/nvidia/tegra-vde/Kconfig"
3 changes: 3 additions & 0 deletions drivers/media/platform/qcom/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-y += camss/
obj-y += venus/
3 changes: 3 additions & 0 deletions drivers/media/platform/rockchip/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-y += rga/
obj-y += rkisp1/
7 changes: 7 additions & 0 deletions drivers/media/platform/samsung/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
source "drivers/media/platform/samsung/exynos-gsc/Kconfig"
source "drivers/media/platform/samsung/exynos4-is/Kconfig"
source "drivers/media/platform/samsung/s3c-camif/Kconfig"
source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
7 changes: 7 additions & 0 deletions drivers/media/platform/samsung/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-y += exynos-gsc/
obj-y += exynos4-is/
obj-y += s3c-camif/
obj-y += s5p-g2d/
obj-y += s5p-jpeg/
obj-y += s5p-mfc/
4 changes: 4 additions & 0 deletions drivers/media/platform/st/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only

source "drivers/media/platform/st/sti/Kconfig"
source "drivers/media/platform/st/stm32/Kconfig"
7 changes: 7 additions & 0 deletions drivers/media/platform/st/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only

obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
obj-y += sti/delta/
obj-y += sti/hva/
obj-y += stm32/
6 changes: 6 additions & 0 deletions drivers/media/platform/st/sti/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-y += bdisp/
obj-y += c8sectpfe/
obj-y += delta/
obj-y += hva/
obj-y += stm32/
5 changes: 5 additions & 0 deletions drivers/media/platform/ti/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,8 @@ config VIDEO_TI_VPE_DEBUG
depends on VIDEO_TI_VPE
help
Enable debug messages on VPE driver.

source "drivers/media/platform/ti/am437x/Kconfig"
source "drivers/media/platform/ti/davinci/Kconfig"
source "drivers/media/platform/ti/omap/Kconfig"
source "drivers/media/platform/ti/omap3isp/Kconfig"
6 changes: 5 additions & 1 deletion drivers/media/platform/ti/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
obj-y += am437x/
obj-y += cal/
obj-y += vpe/
obj-y += davinci/
obj-y += omap/
obj-y += omap3isp/

0 comments on commit f2ab6d3

Please sign in to comment.