imx6: disable sdma until license issues are solved

Also, synchronize patches with upstream.

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 37853
This commit is contained in:
Luka Perkov
2013-08-28 00:07:43 +00:00
parent 99c46e474e
commit ae660e85d3
5 changed files with 55 additions and 81 deletions

View File

@@ -170,7 +170,7 @@ CONFIG_I2C_IMX=y
# CONFIG_IMX2_WDT is not set
# CONFIG_IMX_DMA is not set
CONFIG_IMX_PCIE=y
CONFIG_IMX_SDMA=y
# CONFIG_IMX_SDMA is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_IRQCHIP=y
CONFIG_IRQ_DOMAIN=y
@@ -213,8 +213,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MULTI_IRQ_HANDLER=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_MX3_IPU=y
CONFIG_MX3_IPU_IRQS=4
# CONFIG_MX3_IPU is not set
# CONFIG_MXC_DEBUG_BOARD is not set
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXS_DMA=y