diff options
author | Nathan Rossi <nathan.rossi@xilinx.com> | 2015-03-02 15:58:13 +1000 |
---|---|---|
committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2015-03-31 15:56:46 +1000 |
commit | 1d3fe7ffab6d072fc536c28c6df9b8a3c6d3f187 (patch) | |
tree | 8eedd0f85e883f1f0734fac871d0975c99b7f7c8 | |
parent | 8f97134e3a4196b51d6514cc27adc8c69539f061 (diff) | |
download | meta-xilinx-1d3fe7ffab6d072fc536c28c6df9b8a3c6d3f187.tar.gz |
linux-xlnx: Remove the 3.10 kernel
* The linux-xlnx 3.10 kernel is old and no longer being maintained, and
thus being removed
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-rw-r--r-- | recipes-kernel/linux/linux-xlnx/3.10/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch | 33 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-xlnx_3.10.bb | 16 |
2 files changed, 0 insertions, 49 deletions
diff --git a/recipes-kernel/linux/linux-xlnx/3.10/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch b/recipes-kernel/linux/linux-xlnx/3.10/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch deleted file mode 100644 index 4ecd4e48..00000000 --- a/recipes-kernel/linux/linux-xlnx/3.10/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From c2a532266240230c5b49e56f1035e9ba27a61d96 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nathan Rossi <nathan.rossi@xilinx.com> | ||
3 | Date: Mon, 24 Nov 2014 15:11:43 +1000 | ||
4 | Subject: [PATCH] tty: xuartps: Fix RX hang, and TX corruption in set_termios | ||
5 | |||
6 | Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> | ||
7 | --- | ||
8 | drivers/tty/serial/xilinx_uartps.c | 9 +++++---- | ||
9 | 1 file changed, 5 insertions(+), 4 deletions(-) | ||
10 | |||
11 | diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c | ||
12 | index faf2d90..7c842f2 100644 | ||
13 | --- a/drivers/tty/serial/xilinx_uartps.c | ||
14 | +++ b/drivers/tty/serial/xilinx_uartps.c | ||
15 | @@ -642,10 +642,11 @@ static void xuartps_set_termios(struct uart_port *port, | ||
16 | |||
17 | spin_lock_irqsave(&port->lock, flags); | ||
18 | |||
19 | - /* Empty the receive FIFO 1st before making changes */ | ||
20 | - while ((xuartps_readl(XUARTPS_SR_OFFSET) & | ||
21 | - XUARTPS_SR_RXEMPTY) != XUARTPS_SR_RXEMPTY) | ||
22 | - xuartps_readl(XUARTPS_FIFO_OFFSET); | ||
23 | + /* Wait for the transmit FIFO to empty before making changes */ | ||
24 | + if (!(xuartps_readl(XUARTPS_CR_OFFSET) & XUARTPS_CR_TX_DIS)) { | ||
25 | + while (!(xuartps_readl(XUARTPS_SR_OFFSET) & XUARTPS_SR_TXEMPTY)) | ||
26 | + cpu_relax(); | ||
27 | + } | ||
28 | |||
29 | /* Disable the TX and RX to set baud rate */ | ||
30 | xuartps_writel(xuartps_readl(XUARTPS_CR_OFFSET) | | ||
31 | -- | ||
32 | 2.1.1 | ||
33 | |||
diff --git a/recipes-kernel/linux/linux-xlnx_3.10.bb b/recipes-kernel/linux/linux-xlnx_3.10.bb deleted file mode 100644 index d32c4241..00000000 --- a/recipes-kernel/linux/linux-xlnx_3.10.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | # Kernel version and SRCREV correspond to: | ||
2 | LINUX_VERSION = "3.10" | ||
3 | # xilinx-v14.7 tag | ||
4 | SRCREV ?= "efc27505715e64526653f35274717c0fc56491e3" | ||
5 | PR = "r1" | ||
6 | |||
7 | include linux-xlnx.inc | ||
8 | |||
9 | # The MACB driver is non-functional in the 3.10 kernel | ||
10 | KERNEL_FEATURES_append_zynq += "features/xilinx/disable-macb.scc" | ||
11 | |||
12 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx/3.10:" | ||
13 | SRC_URI_append += " \ | ||
14 | file://tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch \ | ||
15 | " | ||
16 | |||