From f2ab6d3e8c485f794b5e2de07c09d2bd653ef85e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 13 Mar 2022 11:18:21 +0100 Subject: [PATCH] media: platform: Create vendor/{Makefile,Kconfig} files 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 --- drivers/media/platform/Kconfig | 29 ++++++----------------------- drivers/media/platform/Makefile | 29 +++++++---------------------- drivers/media/platform/amlogic/Kconfig | 2 ++ drivers/media/platform/amlogic/Makefile | 2 ++ drivers/media/platform/amphion/Kconfig | 3 +++ drivers/media/platform/mediatek/Kconfig | 5 +++++ drivers/media/platform/mediatek/Makefile | 5 +++++ drivers/media/platform/nvidia/Kconfig | 2 ++ drivers/media/platform/qcom/Makefile | 3 +++ drivers/media/platform/rockchip/Makefile | 3 +++ drivers/media/platform/samsung/Kconfig | 7 +++++++ drivers/media/platform/samsung/Makefile | 7 +++++++ drivers/media/platform/st/Kconfig | 4 ++++ drivers/media/platform/st/Makefile | 7 +++++++ drivers/media/platform/st/sti/Makefile | 6 ++++++ drivers/media/platform/ti/Kconfig | 5 +++++ drivers/media/platform/ti/Makefile | 6 +++++- 17 files changed, 79 insertions(+), 46 deletions(-) create mode 100644 drivers/media/platform/amlogic/Kconfig create mode 100644 drivers/media/platform/amlogic/Makefile create mode 100644 drivers/media/platform/mediatek/Kconfig create mode 100644 drivers/media/platform/mediatek/Makefile create mode 100644 drivers/media/platform/nvidia/Kconfig create mode 100644 drivers/media/platform/qcom/Makefile create mode 100644 drivers/media/platform/rockchip/Makefile create mode 100644 drivers/media/platform/samsung/Kconfig create mode 100644 drivers/media/platform/samsung/Makefile create mode 100644 drivers/media/platform/st/Kconfig create mode 100644 drivers/media/platform/st/Makefile create mode 100644 drivers/media/platform/st/sti/Makefile diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 4a8d2872..b4f6281 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -62,12 +62,8 @@ 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" @@ -75,29 +71,16 @@ 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" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 8d109ae..a881e97 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -6,8 +6,7 @@ # 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/ @@ -15,29 +14,15 @@ 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/ diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platform/amlogic/Kconfig new file mode 100644 index 0000000..c67e00d --- /dev/null +++ b/drivers/media/platform/amlogic/Kconfig @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" diff --git a/drivers/media/platform/amlogic/Makefile b/drivers/media/platform/amlogic/Makefile new file mode 100644 index 0000000..d3cdb8f --- /dev/null +++ b/drivers/media/platform/amlogic/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y += meson-ge2d/ diff --git a/drivers/media/platform/amphion/Kconfig b/drivers/media/platform/amphion/Kconfig index 1389964..e0e8098 100644 --- a/drivers/media/platform/amphion/Kconfig +++ b/drivers/media/platform/amphion/Kconfig @@ -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 diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig new file mode 100644 index 0000000..6d74839 --- /dev/null +++ b/drivers/media/platform/mediatek/Kconfig @@ -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" diff --git a/drivers/media/platform/mediatek/Makefile b/drivers/media/platform/mediatek/Makefile new file mode 100644 index 0000000..403d5ec --- /dev/null +++ b/drivers/media/platform/mediatek/Makefile @@ -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/ diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig new file mode 100644 index 0000000..1162e27 --- /dev/null +++ b/drivers/media/platform/nvidia/Kconfig @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +source "drivers/media/platform/nvidia/tegra-vde/Kconfig" diff --git a/drivers/media/platform/qcom/Makefile b/drivers/media/platform/qcom/Makefile new file mode 100644 index 0000000..4f055c3 --- /dev/null +++ b/drivers/media/platform/qcom/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y += camss/ +obj-y += venus/ diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile new file mode 100644 index 0000000..4f782b8 --- /dev/null +++ b/drivers/media/platform/rockchip/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y += rga/ +obj-y += rkisp1/ diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platform/samsung/Kconfig new file mode 100644 index 0000000..94f30c1 --- /dev/null +++ b/drivers/media/platform/samsung/Kconfig @@ -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" diff --git a/drivers/media/platform/samsung/Makefile b/drivers/media/platform/samsung/Makefile new file mode 100644 index 0000000..21fea33 --- /dev/null +++ b/drivers/media/platform/samsung/Makefile @@ -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/ diff --git a/drivers/media/platform/st/Kconfig b/drivers/media/platform/st/Kconfig new file mode 100644 index 0000000..592c7b9 --- /dev/null +++ b/drivers/media/platform/st/Kconfig @@ -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" diff --git a/drivers/media/platform/st/Makefile b/drivers/media/platform/st/Makefile new file mode 100644 index 0000000..a1f75b2 --- /dev/null +++ b/drivers/media/platform/st/Makefile @@ -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/ diff --git a/drivers/media/platform/st/sti/Makefile b/drivers/media/platform/st/sti/Makefile new file mode 100644 index 0000000..f9ce816 --- /dev/null +++ b/drivers/media/platform/st/sti/Makefile @@ -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/ diff --git a/drivers/media/platform/ti/Kconfig b/drivers/media/platform/ti/Kconfig index 82e285c..e1ab56c 100644 --- a/drivers/media/platform/ti/Kconfig +++ b/drivers/media/platform/ti/Kconfig @@ -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" diff --git a/drivers/media/platform/ti/Makefile b/drivers/media/platform/ti/Makefile index bbc737c..98c5fe5 100644 --- a/drivers/media/platform/ti/Makefile +++ b/drivers/media/platform/ti/Makefile @@ -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/ -- 2.7.4