aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/imx_v4_v5_defconfig1
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig3
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 78ed575feb1a..d10040108249 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -121,6 +121,7 @@ CONFIG_REGULATOR_MC13892=y
121CONFIG_MEDIA_SUPPORT=y 121CONFIG_MEDIA_SUPPORT=y
122CONFIG_VIDEO_DEV=y 122CONFIG_VIDEO_DEV=y
123CONFIG_V4L_PLATFORM_DRIVERS=y 123CONFIG_V4L_PLATFORM_DRIVERS=y
124CONFIG_MEDIA_CAMERA_SUPPORT=y
124CONFIG_SOC_CAMERA=y 125CONFIG_SOC_CAMERA=y
125CONFIG_SOC_CAMERA_OV2640=y 126CONFIG_SOC_CAMERA_OV2640=y
126CONFIG_VIDEO_MX2=y 127CONFIG_VIDEO_MX2=y
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 394ded624e37..508ac9d8e056 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -143,15 +143,18 @@ CONFIG_GPIO_MC9S08DZ60=y
143# CONFIG_HWMON is not set 143# CONFIG_HWMON is not set
144CONFIG_WATCHDOG=y 144CONFIG_WATCHDOG=y
145CONFIG_IMX2_WDT=y 145CONFIG_IMX2_WDT=y
146CONFIG_MFD_DA9052_I2C=y
146CONFIG_MFD_MC13XXX_SPI=y 147CONFIG_MFD_MC13XXX_SPI=y
147CONFIG_MFD_MC13XXX_I2C=y 148CONFIG_MFD_MC13XXX_I2C=y
148CONFIG_REGULATOR=y 149CONFIG_REGULATOR=y
149CONFIG_REGULATOR_FIXED_VOLTAGE=y 150CONFIG_REGULATOR_FIXED_VOLTAGE=y
151CONFIG_REGULATOR_DA9052=y
150CONFIG_REGULATOR_MC13783=y 152CONFIG_REGULATOR_MC13783=y
151CONFIG_REGULATOR_MC13892=y 153CONFIG_REGULATOR_MC13892=y
152CONFIG_MEDIA_SUPPORT=y 154CONFIG_MEDIA_SUPPORT=y
153CONFIG_VIDEO_DEV=y 155CONFIG_VIDEO_DEV=y
154CONFIG_V4L_PLATFORM_DRIVERS=y 156CONFIG_V4L_PLATFORM_DRIVERS=y
157CONFIG_MEDIA_CAMERA_SUPPORT=y
155CONFIG_SOC_CAMERA=y 158CONFIG_SOC_CAMERA=y
156CONFIG_SOC_CAMERA_OV2640=y 159CONFIG_SOC_CAMERA_OV2640=y
157CONFIG_VIDEO_MX3=y 160CONFIG_VIDEO_MX3=y