diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-08-01 10:08:15 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-08-01 10:08:15 +0800 |
| commit | 859da0d8d39b32c424721d0501e85587b3043970 (patch) | |
| tree | 4313a07d795768c6067b4ee56e71adfb7f5ff4d3 /arch | |
| parent | d81dac54ea06a1f8a74acf91499d5946d94d9e6a (diff) | |
ENGR00218997 defconfig: update android defconfig after merge
Update for LDO bypass on mx6sl.
Update for USB H1 on mx6q/dl/sl.
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/imx6_android_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/imx6s_android_defconfig | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig index 06e49ec07b90..fc2549e75899 100644 --- a/arch/arm/configs/imx6_android_defconfig +++ b/arch/arm/configs/imx6_android_defconfig @@ -332,6 +332,7 @@ CONFIG_MACH_MX6Q_SABREAUTO=y # MX6 Options: # # CONFIG_IMX_PCIE is not set +CONFIG_USB_EHCI_ARC_H1=y # CONFIG_MX6_INTER_LDO_BYPASS is not set CONFIG_ISP1504_MXC=y # CONFIG_MXC_IRQ_PRIOR is not set diff --git a/arch/arm/configs/imx6s_android_defconfig b/arch/arm/configs/imx6s_android_defconfig index 1be54fc2017e..4b7252377c95 100644 --- a/arch/arm/configs/imx6s_android_defconfig +++ b/arch/arm/configs/imx6s_android_defconfig @@ -337,7 +337,8 @@ CONFIG_MACH_MX6Q_SABRESD=y # MX6 Options: # # CONFIG_IMX_PCIE is not set -# CONFIG_MX6_INTER_LDO_BYPASS is not set +CONFIG_USB_EHCI_ARC_H1=y +CONFIG_MX6_INTER_LDO_BYPASS=y CONFIG_ISP1504_MXC=y # CONFIG_MXC_IRQ_PRIOR is not set CONFIG_MXC_PWM=y |