The i.MX defconfig updates for 4.5:

- Drop CONFIG_SOC_LS1021A support, as it needs LPAE which is not
   available with imx_v6_v7_defconfig.
 - Enable VF610_ADC, HDMI audio and PCI_MSI support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJWeV+iAAoJEFBXWFqHsHzOB1sH/Ru5qv6aLNiEXXeCS+NGQyQR
 WMiJhxEYEzrXQ7nut04MCxXlmU+6bawxeK/fFv2Ll81RNQHKuzSXQxbuQCtrgDB1
 Vwf1KcLfMiyHS2gOlmv6CXAGU39Hvtkc7GEiwypHOEkjFLQuif/0biLGwDAJ3UY0
 VHD0ZokirveOcP3/kwR6AfIoY13GYiVRMTiSSLtzFE3OwYDpkjoxv9pQCNHL6bl+
 7Zp8T72kEo4SIfeA9lrl3ywuBtR2sp1sASbLWPkgRupWK4uXkd2PAYVk2tehfGn8
 6bcnfCVoBGg4zqHiFgQMoszobVXoybPZ0dmottae7+C9jf40TQKxvn/FM/8h8B0=
 =Fxdw
 -----END PGP SIGNATURE-----

Merge tag 'imx-defconfig-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig

The i.MX defconfig updates for 4.5:
- Drop CONFIG_SOC_LS1021A support, as it needs LPAE which is not
  available with imx_v6_v7_defconfig.
- Enable VF610_ADC, HDMI audio and PCI_MSI support

* tag 'imx-defconfig-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: enable PCI_MSI
  ARM: imx_v6_v7_defconfig: Select HDMI audio support
  ARM: imx_v6_v7_defconfig: Select VF610_ADC
  ARM: imx_v6_v7_defconfig: Remove CONFIG_SOC_LS1021A

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-12-22 15:00:22 -08:00
commit f3afce26de

View file

@ -42,9 +42,9 @@ CONFIG_SOC_IMX6SL=y
CONFIG_SOC_IMX6SX=y
CONFIG_SOC_IMX6UL=y
CONFIG_SOC_IMX7D=y
CONFIG_SOC_LS1021A=y
CONFIG_SOC_VF610=y
CONFIG_PCI=y
CONFIG_PCI_MSI=y
CONFIG_PCI_IMX6=y
CONFIG_SMP=y
CONFIG_PREEMPT_VOLUNTARY=y
@ -224,6 +224,7 @@ CONFIG_SOC_CAMERA_OV2640=y
CONFIG_IMX_IPUV3_CORE=y
CONFIG_DRM=y
CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_IMX=y
CONFIG_DRM_IMX_FB_HELPER=y
CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
@ -315,6 +316,8 @@ CONFIG_MXS_DMA=y
CONFIG_FSL_EDMA=y
CONFIG_STAGING=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_IIO=y
CONFIG_VF610_ADC=y
CONFIG_PWM=y
CONFIG_PWM_IMX=y
CONFIG_EXT2_FS=y