From 04f7e42bca4b7390db817e20c477e4c8e1736dbd Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Tue, 11 Dec 2018 16:29:01 +0100 Subject: apalis/colibri_imx6_defconfig: re-order kernel configurations Signed-off-by: Marcel Ziswiler Acked-by: Max Krummenacher --- arch/arm/configs/apalis_imx6_defconfig | 6 +++--- arch/arm/configs/colibri_imx6_defconfig | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'arch/arm/configs') diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig index 657a5bd5c0d9..7368627cdf65 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -181,6 +181,8 @@ CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_MXC_OUTPUT=y CONFIG_VIDEO_MXC_CAPTURE=m +CONFIG_VIDEO_MXC_CSI_CAMERA=m +CONFIG_MXC_VADC=m CONFIG_MXC_CAMERA_OV5640=m CONFIG_MXC_CAMERA_OV5642=m CONFIG_MXC_CAMERA_OV5640_MIPI=m @@ -190,8 +192,6 @@ CONFIG_MXC_TVIN_MAX9526=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m CONFIG_VIDEO_MXC_IPU_OUTPUT=y CONFIG_VIDEO_MXC_PXP_V4L2=y -CONFIG_VIDEO_MXC_CSI_CAMERA=m -CONFIG_MXC_VADC=m CONFIG_SOC_CAMERA=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set # CONFIG_DVB_AU8522_V4L is not set @@ -269,8 +269,8 @@ CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_ESDHC_IMX=y -CONFIG_MXC_IPU=y CONFIG_MXC_GPU_VIV=y +CONFIG_MXC_IPU=y CONFIG_MXC_MIPI_CSI2=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig index e596873b5a86..60ce2243ee8e 100644 --- a/arch/arm/configs/colibri_imx6_defconfig +++ b/arch/arm/configs/colibri_imx6_defconfig @@ -177,6 +177,8 @@ CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_MXC_OUTPUT=y CONFIG_VIDEO_MXC_CAPTURE=m +CONFIG_VIDEO_MXC_CSI_CAMERA=m +CONFIG_MXC_VADC=m CONFIG_MXC_CAMERA_OV5640=m CONFIG_MXC_CAMERA_OV5642=m CONFIG_MXC_CAMERA_OV5640_MIPI=m @@ -186,8 +188,6 @@ CONFIG_MXC_TVIN_MAX9526=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m CONFIG_VIDEO_MXC_IPU_OUTPUT=y CONFIG_VIDEO_MXC_PXP_V4L2=y -CONFIG_VIDEO_MXC_CSI_CAMERA=m -CONFIG_MXC_VADC=m CONFIG_SOC_CAMERA=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set # CONFIG_DVB_AU8522_V4L is not set @@ -261,8 +261,8 @@ CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_ESDHC_IMX=y -CONFIG_MXC_IPU=y CONFIG_MXC_GPU_VIV=y +CONFIG_MXC_IPU=y CONFIG_MXC_MIPI_CSI2=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y -- cgit v1.2.3