diff options
| author | Haoran Wang <Haoran.Wang@freescale.com> | 2016-01-05 00:20:47 +0800 |
|---|---|---|
| committer | leozwang <leozwang@google.com> | 2016-01-04 08:49:16 -0800 |
| commit | ce0071d0d8cbf313a533f65838c465e93237fc09 (patch) | |
| tree | bed54f8a732cd8788c0eb8fab63074b70e9b3c91 | |
| parent | 5f5b7f32fc824182c38f5fb73135c35552a3a44c (diff) | |
| download | freescale-ce0071d0d8cbf313a533f65838c465e93237fc09.tar.gz | |
*UPSTREAM: *pico-imx6ul: Merge defconfig in android config
Merge defconfig from picosom-imx6ul_defconfig to
imx_v7_android_defconfig.
Signed-off-by: Haoran Wang <Haoran.Wang@freescale.com>
Change-Id: Id854daed68f03646909b06094314ad8bfdfa3712
| -rw-r--r-- | arch/arm/configs/imx_v7_android_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v7_android_defconfig b/arch/arm/configs/imx_v7_android_defconfig index 5682e78e00c..e1d918a3817 100644 --- a/arch/arm/configs/imx_v7_android_defconfig +++ b/arch/arm/configs/imx_v7_android_defconfig @@ -528,6 +528,7 @@ CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_SWITCH=y CONFIG_RTC_CLASS=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_MC13XXX=y CONFIG_RTC_DRV_MXC=y CONFIG_RTC_DRV_SNVS=y @@ -549,6 +550,7 @@ CONFIG_ION=y CONFIG_ION_MXC=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y +CONFIG_TI_ADC081C=y CONFIG_VF610_ADC=y CONFIG_AD2802A=y CONFIG_PWM=y |