aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/linux/imx6/config-4.142
-rw-r--r--target/linux/imx6/files/firmware/imx/sdma/sdma-imx6q.binbin0 -> 2196 bytes
-rw-r--r--target/linux/imx6/patches-4.14/210-disable-uart-dma.patch23
3 files changed, 2 insertions, 23 deletions
diff --git a/target/linux/imx6/config-4.14 b/target/linux/imx6/config-4.14
index fe975e63fe..2b87e0d545 100644
--- a/target/linux/imx6/config-4.14
+++ b/target/linux/imx6/config-4.14
@@ -185,6 +185,8 @@ CONFIG_F2FS_FS=y
# CONFIG_F2FS_FS_SECURITY is not set
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_STAT_FS=y
+CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q.bin"
+CONFIG_EXTRA_FIRMWARE_DIR="firmware"
CONFIG_FEC=y
CONFIG_FIXED_PHY=y
CONFIG_FIX_EARLYCON_MEM=y
diff --git a/target/linux/imx6/files/firmware/imx/sdma/sdma-imx6q.bin b/target/linux/imx6/files/firmware/imx/sdma/sdma-imx6q.bin
new file mode 100644
index 0000000000..f0b5252a6f
--- /dev/null
+++ b/target/linux/imx6/files/firmware/imx/sdma/sdma-imx6q.bin
Binary files differ
diff --git a/target/linux/imx6/patches-4.14/210-disable-uart-dma.patch b/target/linux/imx6/patches-4.14/210-disable-uart-dma.patch
deleted file mode 100644
index 6abbb93301..0000000000
--- a/target/linux/imx6/patches-4.14/210-disable-uart-dma.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Based on following upstream patch by Tim Harvey (Gateworks):
-
-https://github.com/Gateworks/openwrt/commit/80a01b6582f94c4547f39d3a25e0a1e9b6eb9877
-
-TX complete DMA messages are getting missed.
-This is also currently an issue in mainline.
-For now we will disable DMA in serial/imx.c.
-
-This resolves an issue encountered with RS485 transmit.
-
---- a/drivers/tty/serial/imx.c
-+++ b/drivers/tty/serial/imx.c
-@@ -1268,10 +1268,6 @@ static int imx_startup(struct uart_port
-
- writel(temp & ~UCR4_DREN, sport->port.membase + UCR4);
-
-- /* Can we enable the DMA support? */
-- if (!uart_console(port) && !sport->dma_is_inited)
-- imx_uart_dma_init(sport);
--
- spin_lock_irqsave(&sport->port.lock, flags);
- /* Reset fifo's and state machines */
- i = 100;