diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-08-28 00:07:43 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-08-28 00:07:43 +0000 |
| commit | e0b475661e65aaaac84620f359e817537cdf3c00 (patch) | |
| tree | b7356e713be09ee1b6101a400d4a1636a187c371 /target/linux/imx6/config-3.10 | |
| parent | 95fe0abb960b0e7987da1537b0f8af3b4e9a8675 (diff) | |
| download | upstream-e0b475661e65aaaac84620f359e817537cdf3c00.tar.gz upstream-e0b475661e65aaaac84620f359e817537cdf3c00.tar.bz2 upstream-e0b475661e65aaaac84620f359e817537cdf3c00.zip | |
imx6: disable sdma until license issues are solved
Also, synchronize patches with upstream.
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37853 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/imx6/config-3.10')
| -rw-r--r-- | target/linux/imx6/config-3.10 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/imx6/config-3.10 b/target/linux/imx6/config-3.10 index 1a1d30ae92..7978cd8077 100644 --- a/target/linux/imx6/config-3.10 +++ b/target/linux/imx6/config-3.10 @@ -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 |