diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 23:18:02 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 23:18:02 +0100 |
| commit | 620a60075b756d77b87dc1d9da44f57464ffb898 (patch) | |
| tree | a0fa16e28d807294ee78037364d63e62342d89b3 /arch/arm/configs/omap2plus_defconfig | |
| parent | 68d61aed7d9c0cf90a9b7d99a658737f6af42fbc (diff) | |
| parent | c73a1f13d07fc89734f28760554fc365b91c750a (diff) | |
Merge tag 'imx-defconfig-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig
Merge "i.MX defconfig update for 4.6" from Shawn Guo:
- Enable i.MX25 Touchscreen controller and ADC support
- Enable NVMEM OCOTP driver support
- Clean up mxs_defconfig and imx_v4_v5_defconfig
- Enable initramfs support
- Enable PSCI, SAHARA and more Vybrid driver support
* tag 'imx-defconfig-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx_v4_v5_defconfig: Enable initramfs support
ARM: imx_v4_v5_defconfig: Cleanup imx_v4_v5_defconfig
ARM: mxs_defconfig: Enable initramfs support
ARM: mxs_defconfig: Cleanup mxs_defconfig
ARM: imx_v6_v7_defconfig: enable useful configurations for Vybrid
ARM: imx_v6_v7_defconfig: Select CONFIG_CRYPTO_DEV_SAHARA
ARM: imx_v4_v5_defconfig: Add I.MX25 Touchscreen controller and ADC support.
ARM: mxs_defconfig: Select CONFIG_NVMEM_MXS_OCOTP
ARM: imx_v6_v7_defconfig: Select CONFIG_NVMEM_IMX_OCOTP
ARM: imx_v6_v7_defconfig: enable psci default
Diffstat (limited to 'arch/arm/configs/omap2plus_defconfig')
0 files changed, 0 insertions, 0 deletions