Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: platform: Makefile: reorganize its contents

There are lots of inconsistencies here: some directories are
included as-is, and others included using one (or more) symbols
that are inside it. Also, its entries are not sorted.

That makes it harder to maintain.

Reorganize it by placing everything on alphabetic order and
providing some hints about how patches for such file is expected.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

+50 -82
+50 -82
drivers/media/platform/Makefile
··· 3 3 # Makefile for the video capture/playback device drivers. 4 4 # 5 5 6 - obj-$(CONFIG_VIDEO_ALLEGRO_DVT) += allegro-dvt/ 6 + # Place here, alphabetically sorted by directory 7 + # (e. g. LC_ALL=C sort Makefile) 8 + obj-y += allegro-dvt/ 9 + obj-y += am437x/ 10 + obj-y += amphion/ 11 + obj-y += atmel/ 12 + obj-y += cadence/ 13 + obj-y += coda/ 14 + obj-y += davinci/ 15 + obj-y += exynos-gsc/ 16 + obj-y += exynos4-is/ 17 + obj-y += imx/ 18 + obj-y += imx-jpeg/ 19 + obj-y += marvell-ccic/ 20 + obj-y += meson/ge2d/ 21 + obj-y += mtk-jpeg/ 22 + obj-y += mtk-mdp/ 23 + obj-y += mtk-vcodec/ 24 + obj-y += mtk-vpu/ 25 + obj-y += omap/ 26 + obj-y += omap3isp/ 27 + obj-y += qcom/camss/ 28 + obj-y += qcom/venus/ 29 + obj-y += rcar-vin/ 30 + obj-y += rockchip/rga/ 31 + obj-y += rockchip/rkisp1/ 32 + obj-y += s3c-camif/ 33 + obj-y += s5p-g2d/ 34 + obj-y += s5p-jpeg/ 35 + obj-y += s5p-mfc/ 36 + obj-y += sti/bdisp/ 37 + obj-y += sti/c8sectpfe/ 38 + obj-y += sti/delta/ 39 + obj-y += sti/hva/ 40 + obj-y += stm32/ 41 + obj-y += sunxi/ 42 + obj-y += tegra/vde/ 43 + obj-y += ti-vpe/ 44 + obj-y += vsp1/ 45 + obj-y += xilinx/ 46 + 47 + # Please place here only ancillary drivers that aren't SoC-specific 48 + # Please keep it alphabetically sorted by Kconfig name 49 + # (e. g. LC_ALL=C sort Makefile) 7 50 obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o 8 - obj-$(CONFIG_VIDEO_CADENCE) += cadence/ 9 - obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o 10 - obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/ 11 - obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/ 12 - 13 - obj-$(CONFIG_VIDEO_OMAP3) += omap3isp/ 14 - obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o 15 - 16 - obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o 17 - 18 - obj-y += ti-vpe/ 19 - 20 - obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o 21 - obj-$(CONFIG_VIDEO_CODA) += coda/ 22 - 23 - obj-$(CONFIG_VIDEO_IMX) += imx/ 24 51 obj-$(CONFIG_VIDEO_IMX_PXP) += imx-pxp.o 25 - obj-$(CONFIG_VIDEO_IMX8_JPEG) += imx-jpeg/ 26 - 27 52 obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o 28 - 29 53 obj-$(CONFIG_VIDEO_MUX) += video-mux.o 30 - 31 - obj-$(CONFIG_VIDEO_S3C_CAMIF) += s3c-camif/ 32 - obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS) += exynos4-is/ 33 - obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) += s5p-jpeg/ 34 - obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/ 35 - 36 - obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) += s5p-g2d/ 37 - obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ 38 - 39 - obj-$(CONFIG_VIDEO_STI_BDISP) += sti/bdisp/ 40 - obj-$(CONFIG_VIDEO_STI_HVA) += sti/hva/ 41 - obj-$(CONFIG_DVB_C8SECTPFE) += sti/c8sectpfe/ 42 - 43 - obj-$(CONFIG_VIDEO_STI_DELTA) += sti/delta/ 44 - 45 - obj-y += stm32/ 46 - 47 - obj-y += davinci/ 48 - 49 - obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o 50 - 54 + obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o 55 + obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o 51 56 obj-$(CONFIG_VIDEO_RCAR_DRIF) += rcar_drif.o 57 + obj-$(CONFIG_VIDEO_RCAR_ISP) += rcar-isp.o 52 58 obj-$(CONFIG_VIDEO_RENESAS_CEU) += renesas-ceu.o 53 59 obj-$(CONFIG_VIDEO_RENESAS_FCP) += rcar-fcp.o 54 60 obj-$(CONFIG_VIDEO_RENESAS_FDP1) += rcar_fdp1.o 55 61 obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o 56 - obj-$(CONFIG_VIDEO_RENESAS_VSP1) += vsp1/ 57 - 58 - obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) += rockchip/rkisp1/ 59 - obj-$(CONFIG_VIDEO_ROCKCHIP_RGA) += rockchip/rga/ 60 - 61 - obj-y += omap/ 62 - 63 - obj-$(CONFIG_VIDEO_AM437X_VPFE) += am437x/ 64 - 65 - obj-$(CONFIG_VIDEO_XILINX) += xilinx/ 66 - 67 - obj-$(CONFIG_VIDEO_RCAR_ISP) += rcar-isp.o 68 - obj-$(CONFIG_VIDEO_RCAR_VIN) += rcar-vin/ 69 - 70 - obj-$(CONFIG_VIDEO_ATMEL_ISC) += atmel/ 71 - obj-$(CONFIG_VIDEO_ATMEL_ISI) += atmel/ 72 - obj-$(CONFIG_VIDEO_ATMEL_XISC) += atmel/ 73 - obj-$(CONFIG_VIDEO_MICROCHIP_CSI2DC) += atmel/ 74 - 75 - obj-$(CONFIG_VIDEO_STM32_DCMI) += stm32/ 76 - obj-$(CONFIG_VIDEO_STM32_DMA2D) += stm32/ 77 - 78 - obj-$(CONFIG_VIDEO_MEDIATEK_VPU) += mtk-vpu/ 79 - 80 - obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec/ 81 - 82 - obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp/ 83 - 84 - obj-$(CONFIG_VIDEO_MEDIATEK_JPEG) += mtk-jpeg/ 85 - 86 - obj-$(CONFIG_VIDEO_QCOM_CAMSS) += qcom/camss/ 87 - 88 - obj-$(CONFIG_VIDEO_QCOM_VENUS) += qcom/venus/ 89 - 90 - obj-y += sunxi/ 91 - 92 - obj-$(CONFIG_VIDEO_MESON_GE2D) += meson/ge2d/ 93 - 94 - obj-$(CONFIG_VIDEO_TEGRA_VDE) += tegra/vde/ 95 - 96 - obj-$(CONFIG_VIDEO_AMPHION_VPU) += amphion/ 62 + obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o 63 + obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o 64 + obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o