From 0b9f665205c36306f5433de78df3aebf08b53082 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 10 Jun 2014 20:59:03 +0200 Subject: update to 3.15, rb532 pci patch no longer required --- .../mips/mikrotik-rb532/patches/3.15-rc7/rb532-pci.patch | 11 ----------- .../mikrotik-rb532/patches/3.15-rc7/rb532-serial.patch | 15 --------------- .../mikrotik-rb532/patches/3.15-rc8/rb532-serial.patch | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 26 deletions(-) delete mode 100644 target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-pci.patch delete mode 100644 target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-serial.patch create mode 100644 target/mips/mikrotik-rb532/patches/3.15-rc8/rb532-serial.patch (limited to 'target/mips') diff --git a/target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-pci.patch b/target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-pci.patch deleted file mode 100644 index 173e49c35..000000000 --- a/target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-pci.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur linux-3.15-rc5.orig/arch/mips/pci/pci-rc32434.c linux-3.15-rc5/arch/mips/pci/pci-rc32434.c ---- linux-3.15-rc5.orig/arch/mips/pci/pci-rc32434.c 2014-05-09 22:10:52.000000000 +0200 -+++ linux-3.15-rc5/arch/mips/pci/pci-rc32434.c 2014-05-16 10:38:10.000000000 +0200 -@@ -53,7 +53,6 @@ - .start = 0x50000000, - .end = 0x5FFFFFFF, - .flags = IORESOURCE_MEM, -- .parent = &rc32434_res_pci_mem1, - .sibling = NULL, - .child = &rc32434_res_pci_mem2 - }; diff --git a/target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-serial.patch b/target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-serial.patch deleted file mode 100644 index 6c6951895..000000000 --- a/target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-serial.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c linux-3.15-rc5/drivers/tty/serial/serial_core.c ---- linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c 2014-05-09 22:10:52.000000000 +0200 -+++ linux-3.15-rc5/drivers/tty/serial/serial_core.c 2014-05-20 10:30:52.000000000 +0200 -@@ -2686,9 +2686,10 @@ - - /* - * If the port is used as a console, unregister it -- */ -+ * DISABLE: breaks serial console on rb532 - if (uart_console(uport)) - unregister_console(uport->cons); -+ */ - - /* - * Free the port IO and memory resources, if any. diff --git a/target/mips/mikrotik-rb532/patches/3.15-rc8/rb532-serial.patch b/target/mips/mikrotik-rb532/patches/3.15-rc8/rb532-serial.patch new file mode 100644 index 000000000..6c6951895 --- /dev/null +++ b/target/mips/mikrotik-rb532/patches/3.15-rc8/rb532-serial.patch @@ -0,0 +1,15 @@ +diff -Nur linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c linux-3.15-rc5/drivers/tty/serial/serial_core.c +--- linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c 2014-05-09 22:10:52.000000000 +0200 ++++ linux-3.15-rc5/drivers/tty/serial/serial_core.c 2014-05-20 10:30:52.000000000 +0200 +@@ -2686,9 +2686,10 @@ + + /* + * If the port is used as a console, unregister it +- */ ++ * DISABLE: breaks serial console on rb532 + if (uart_console(uport)) + unregister_console(uport->cons); ++ */ + + /* + * Free the port IO and memory resources, if any. -- cgit v1.2.3