diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2017-06-17 10:36:40 -0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-06-17 10:36:40 -0300 |
| commit | 683b9eda58bdc48ad6606f22ca318f1d2200934d (patch) | |
| tree | 7acde2eff67256e06cae0419b03af38c5503e5c1 /arch/arm/configs | |
| parent | a4418c438de6ad397fd17f006ca86257fb9ec5a6 (diff) | |
| parent | 30278abfe0977b1d2f065271ce1ea23c0e2d1b6e (diff) | |
Merge remote-tracking branch 'imx/imx_4.1.15_2.0.0_ga' into 4.1-2.0.x-imx
* imx/imx_4.1.15_2.0.0_ga: (157 commits)
MLK-14762 ARM: dts: imx6sll-evk: correct gpio pin for lcd power control
MLK-14285-3 usb: phy: mxs: optimize disconnect line condition
MLK-14285-2 usb: chipidea: set mode for usb phy driver
MLK-14285-1 usb: phy: add usb mode for usb_phy
MLK-14747 driver: cpufreq: Correct dc regulator voltage on imx6ull
MLK-14720 epdc: correct WFE setting when bypass legacy process
MLK-13801-02 ARM: dts: Correct the gpt timer clock source on imx6ul/ull/sll
MLK-13801-01 ARM: imx: add gpt_3m clock on imx6sll
MLK-14680 pxp/epdc: add LUT cancellation feature
MLK-14518-2 pxp: set data path for pxp after reset
MLK-14518-1 pxp: initialize pxp according to recommended flow
MLK-14516 epdc: bypass pxp legacy process when there's no transformation
MLK-14369 epdc: sync LUT status to PXP before enable collision detection
MLK-13198 pxp: imx7d: fix error histogram status report issue
MLK-13917 pxp: fix build error for pxp library in user space
MLK-13862-2 epdc/pxp: imx6ull/imx6sll: enhance the LUT cleanup flow to avoid stalling display
MLK-13862-1 epdc/pxp: imx7d: enhance the LUT cleanup flow to avoid stalling display
MLK-14697 ARM: dts: imx: update the setpoint data of imx6sll
MXSCM-266 arm: dts: increase lpddr2 voltage to 1.25V
MXSCM-265: dts: place imx6sxscm dtb files under CONFIG_SOC_IMX6SX
...
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v7_mfg_defconfig | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index a2a30371aa03..643f4e1c48f0 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -26,6 +26,7 @@ CONFIG_SOC_IMX6SL=y CONFIG_SOC_IMX6SX=y CONFIG_SOC_IMX6ULL=y CONFIG_SOC_IMX7D=y +CONFIG_SOC_IMX6SLL=y CONFIG_SOC_VF610=y # CONFIG_SWP_EMULATE is not set CONFIG_SMP=y @@ -142,7 +143,7 @@ CONFIG_MICREL_PHY=y CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_RTL8152=m -CONFIG_USB_USBNET=m +CONFIG_USB_USBNET=y CONFIG_USB_NET_CDC_EEM=m CONFIG_BCMDHD=y CONFIG_BCMDHD_SDIO=y diff --git a/arch/arm/configs/imx_v7_mfg_defconfig b/arch/arm/configs/imx_v7_mfg_defconfig index d5d19f45087d..1284a01d1eaf 100644 --- a/arch/arm/configs/imx_v7_mfg_defconfig +++ b/arch/arm/configs/imx_v7_mfg_defconfig @@ -29,6 +29,7 @@ CONFIG_SOC_IMX6SX=y CONFIG_SOC_IMX6UL=y CONFIG_SOC_IMX6ULL=y CONFIG_SOC_IMX7D=y +CONFIG_SOC_IMX6SLL=y CONFIG_SOC_VF610=y CONFIG_SMP=y CONFIG_HAVE_ARM_ARCH_TIMER=y |